hermes-agent/VoidLink
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iOS 12 app crash fixes

Browse Source
This commit is contained in:
True Zhuanjia
2026-04-12 22:03:47 +08:00
parent 5beee0ffe4
commit 819aa436e8
4 changed files with 201 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VoidLink/Input/OnScreenWidgetView.swift
+3 -1
View File
@@ -2716,7 +2716,9 @@ import ObjectiveC.runtime
self.relocatedDuringStreaming = true
gamepadOverlayFLag = !gamepadOverlayFLag
self.setupAtrributedText()
self.functionalButtonDelegate?.toggleGamepadOverlay(overlayEnabled: gamepadOverlayFLag)
if #available(iOS 13.0, *) {
self.functionalButtonDelegate?.toggleGamepadOverlay(overlayEnabled: gamepadOverlayFLag)
}
}
private func temporaryDisableFolderButtonAnimation(){
VoidLink/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.swift
+172 -1
View File
@@ -19,7 +19,6 @@ private extension LocalizationHelper {
}
@objcMembers
@objc(LayoutOnScreenControlsViewController)
final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidgetView.OnScreenWidgetGuidelineUpdateDelegate, UITextFieldDelegate {
private enum AlphaSliderMode: Int {
case widgetAlpha
@@ -1176,6 +1175,150 @@ final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidg
widgetView.setVibration(style: Int(UIImpactFeedbackGenerator.FeedbackStyle.light.rawValue))
}
private func configureWidgetAlertTextField(
_ textField: UITextField,
labelText: String,
placeholder: String,
keyboardType: UIKeyboardType,
text: String? = nil,
isEnabled: Bool = true
) {
let label = UILabel()
label.text = LocalizationHelper.localizedString(forKey: labelText)
label.font = .systemFont(ofSize: 15)
label.sizeToFit()
textField.leftView = label
textField.leftViewMode = .always
textField.attributedPlaceholder = GenericUtils.getAtrributedPlaceHolder(text: LocalizationHelper.localizedString(forKey: placeholder))
textField.font = .systemFont(ofSize: 15)
textField.keyboardType = keyboardType
textField.autocorrectionType = .no
textField.spellCheckingType = .no
textField.delegate = self
textField.text = text
textField.isEnabled = isEnabled
}
private func presentLegacyAddWidgetAlert() {
let params = NSMutableDictionary()
let alertController = UIAlertController(
title: LocalizationHelper.localizedString(forKey: ""),
message: LocalizationHelper.localizedString(forKey: "New On-Screen Widget"),
preferredStyle: .alert
)
alertController.addTextField { [weak self] textField in
self?.configureWidgetAlertTextField(
textField,
labelText: "Command: ",
placeholder: "e.g. ctrl, lswheel, wasdpad...",
keyboardType: .asciiCapable
)
}
alertController.addTextField { [weak self] textField in
self?.configureWidgetAlertTextField(
textField,
labelText: "Label: ",
placeholder: "optional",
keyboardType: .default
)
}
alertController.addTextField { [weak self] textField in
self?.configureWidgetAlertTextField(
textField,
labelText: "Shape: ",
placeholder: "r - round/circle, s - square/rect",
keyboardType: .asciiCapable
)
}
let readInstruction = UIAlertAction(title: LocalizationHelper.localizedString(forKey: "Read Widget Instruction"), style: .default) { _ in
if let url = URL(string: LocalizationHelper.localizedString(forKey: "onScreenWidgetStackDoc")),
UIApplication.shared.canOpenURL(url) {
UIApplication.shared.open(url, options: [:], completionHandler: nil)
}
}
let cancelAction = UIAlertAction(title: LocalizationHelper.localizedString(forKey: "Cancel"), style: .cancel)
let okAction = UIAlertAction(title: LocalizationHelper.localizedString(forKey: "OK"), style: .default) { [weak self, weak alertController] _ in
guard let self, let fields = alertController?.textFields, fields.count >= 3 else { return }
params["cmdString"] = fields[0].text ?? ""
params["buttonLabel"] = fields[1].text ?? ""
params["shape"] = fields[2].text ?? ""
self.createWidgetFromParams(params)
}
alertController.addAction(readInstruction)
alertController.addAction(cancelAction)
alertController.addAction(okAction)
present(alertController, animated: true)
}
private func presentLegacyEditWidgetAlert(for widget: OnScreenWidgetView) {
let params = NSMutableDictionary()
let alertController = UIAlertController(
title: LocalizationHelper.localizedString(forKey: ""),
message: LocalizationHelper.localizedString(forKey: "Edit Selected Widget"),
preferredStyle: .alert
)
alertController.addTextField { [weak self] textField in
self?.configureWidgetAlertTextField(
textField,
labelText: "Command: ",
placeholder: "e.g. ctrl, lswheel, wasdpad...",
keyboardType: .asciiCapable,
text: widget.cmdString.lowercased()
)
}
alertController.addTextField { [weak self] textField in
self?.configureWidgetAlertTextField(
textField,
labelText: "Label: ",
placeholder: "optional",
keyboardType: .default,
text: widget.widgetLabel
)
}
alertController.addTextField { [weak self] textField in
self?.configureWidgetAlertTextField(
textField,
labelText: "Shape: ",
placeholder: "r - round/circle, s - square/rect",
keyboardType: .asciiCapable,
text: widget.shape,
isEnabled: widget.shape != "largeSquare"
)
}
let createNewAction = UIAlertAction(title: LocalizationHelper.localizedString(forKey: "Create New"), style: .default) { [weak self, weak alertController] _ in
guard let self, let fields = alertController?.textFields, fields.count >= 3 else { return }
params["cmdString"] = fields[0].text ?? ""
params["buttonLabel"] = fields[1].text ?? ""
params["shape"] = fields[2].text ?? ""
self.updateWidget(widget, params: params, createNew: true)
}
let modifyAction = UIAlertAction(title: LocalizationHelper.localizedString(forKey: "Modify"), style: .default) { [weak self, weak alertController] _ in
guard let self, let fields = alertController?.textFields, fields.count >= 3 else { return }
params["cmdString"] = fields[0].text ?? ""
params["buttonLabel"] = fields[1].text ?? ""
params["shape"] = fields[2].text ?? ""
self.updateWidget(widget, params: params, createNew: false)
}
let cancelAction = UIAlertAction(title: LocalizationHelper.localizedString(forKey: "Cancel"), style: .default)
alertController.addAction(createNewAction)
alertController.addAction(modifyAction)
alertController.addAction(cancelAction)
present(alertController, animated: true)
}
@IBAction func addTapped(_ sender: Any?) {
GenericUtils.autoPopSoftKeyboard = false
if #available(iOS 13.0, *) {
@@ -1188,6 +1331,8 @@ final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidg
present(nav, animated: true)
return
}
presentLegacyAddWidgetAlert()
}
@available(iOS 13.0, *)
@@ -1225,7 +1370,10 @@ final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidg
let nav = UINavigationController(rootViewController: pickerViewController)
nav.modalPresentationStyle = .overFullScreen
present(nav, animated: true)
return
}
presentLegacyEditWidgetAlert(for: selectedWidgetView)
}
@IBAction func saveTapped(_ sender: Any?) {
@@ -1368,6 +1516,29 @@ final class LayoutOnScreenControlsViewController: UIViewController, OnScreenWidg
if #available(iOS 13.0, *) {
} else {
button.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .medium)
button.setImage(nil, for: .normal)
if button === exitButton {
button.setTitle(LocalizationHelper.localizedString(forKey: "Exit"), for: .normal)
}
if button === trashCanButton {
button.setTitle(LocalizationHelper.localizedString(forKey: "Del"), for: .normal)
}
if button === undoButton {
button.setTitle(LocalizationHelper.localizedString(forKey: "Undo"), for: .normal)
}
if button === saveButton {
button.setTitle(LocalizationHelper.localizedString(forKey: "Save"), for: .normal)
}
if button === loadButton {
button.setTitle(LocalizationHelper.localizedString(forKey: "Load"), for: .normal)
}
if button === addButton {
button.setTitle(LocalizationHelper.localizedString(forKey: "Add"), for: .normal)
}
if button === editButton {
button.setTitle(LocalizationHelper.localizedString(forKey: "Edit"), for: .normal)
}
}
}
handleMissingToolBarIcon(subview)
VoidLink/ViewControllers/CustomOSCViewControl/Table/OSCProfilesTableViewController.swift
-2
View File
@@ -11,7 +11,6 @@
import UIKit
@objc(ProfileTableViewCell)
final class ProfileTableViewCell: UITableViewCell {
@IBOutlet weak var name: UILabel!
}
@@ -29,7 +28,6 @@ enum FileOperation: Int {
}
@objcMembers
@objc(OSCProfilesTableViewController)
final class OSCProfilesTableViewController: UIViewController, UITableViewDelegate, UITableViewDataSource, UIDocumentPickerDelegate, UIGestureRecognizerDelegate {
@IBOutlet weak var tableView: UITableView!
@IBOutlet weak var profileTableViewNavigationBar: UINavigationBar!
VoidLink/ViewControllers/SettingsViewController.m
+26 -21
View File
@@ -2408,17 +2408,7 @@ BOOL isCustomResolution(int resolutionSelected) {
}
- (void)onScreenWidgetChanged{
BOOL isIPhone = ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone);
if (isIPhone) {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"iPhone" bundle:nil];
self.layoutOnScreenControlsVC = [storyboard instantiateViewControllerWithIdentifier:@"LayoutOnScreenControlsViewController"];
}
else {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"iPad" bundle:nil];
self.layoutOnScreenControlsVC = [storyboard instantiateViewControllerWithIdentifier:@"LayoutOnScreenControlsViewController"];
self.layoutOnScreenControlsVC.modalPresentationStyle = UIModalPresentationFullScreen;
}
self.layoutOnScreenControlsVC = [self instantiateOscLayoutViewController];
bool customOscEnabled = [self isCustomOswEnabled];
// NSLog(@"customOscEnabled %d", customOscEnabled);
@@ -2743,21 +2733,36 @@ BOOL isCustomResolution(int resolutionSelected) {
// init CustomOSC stuff
/* sets a reference to the correct 'LayoutOnScreenControlsViewController' depending on whether the user is on an iPhone or iPad */
// self.layoutOnScreenControlsVC = [[LayoutOnScreenControlsViewController alloc] init];
BOOL isIPhone = ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone);
if (isIPhone) {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"iPhone" bundle:nil];
self.layoutOnScreenControlsVC = [storyboard instantiateViewControllerWithIdentifier:@"LayoutOnScreenControlsViewController"];
self.layoutOnScreenControlsVC = [self instantiateOscLayoutViewController];
if (self.layoutOnScreenControlsVC == nil) {
return;
}
else {
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"iPad" bundle:nil];
self.layoutOnScreenControlsVC = [storyboard instantiateViewControllerWithIdentifier:@"LayoutOnScreenControlsViewController"];
self.layoutOnScreenControlsVC.modalPresentationStyle = UIModalPresentationFullScreen;
}
self.layoutOnScreenControlsVC.view.backgroundColor = [UIColor colorWithWhite:0.55 alpha:1.0];
[self presentViewController:self.layoutOnScreenControlsVC animated:YES completion:nil];
}
- (LayoutOnScreenControlsViewController *)instantiateOscLayoutViewController {
BOOL isIPhone = ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone);
NSString *storyboardName = isIPhone ? @"iPhone" : @"iPad";
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:storyboardName bundle:nil];
UIViewController *viewController = [storyboard instantiateViewControllerWithIdentifier:@"LayoutOnScreenControlsViewController"];
NSLog(@"[OSC] storyboard=%@ instantiated class=%@", storyboardName, NSStringFromClass([viewController class]));
if (![viewController isKindOfClass:[LayoutOnScreenControlsViewController class]]) {
NSAssert(NO, @"Expected LayoutOnScreenControlsViewController, got %@", NSStringFromClass([viewController class]));
return nil;
}
LayoutOnScreenControlsViewController *layoutViewController = (LayoutOnScreenControlsViewController *)viewController;
if (!isIPhone) {
layoutViewController.modalPresentationStyle = UIModalPresentationFullScreen;
}
return layoutViewController;
}
- (void) pointerVelocityModeDividerSliderMoved:(UISlider* )sender {
[self findDynamicLabelFromStack:self.pointerVelocityDividerStack].text = [NSString stringWithFormat:@" | %d%% | %d%% | ", (uint8_t)sender.value, 100-(uint8_t)sender.value];
}