From d9658508cc374e33f2eea18887b565f63c1f377e Mon Sep 17 00:00:00 2001 From: James Magahern Date: Tue, 29 Mar 2022 17:27:07 -0700 Subject: [PATCH] Fixes for null command --- App/AppDelegate.swift | 2 +- App/Utilities/UIKeyCommand+ConvInit.swift | 8 ++++++++ SBrowser.xcodeproj/project.pbxproj | 4 ---- SBrowser.xcodeproj/xcshareddata/xcschemes/App.xcscheme | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/App/AppDelegate.swift b/App/AppDelegate.swift index 4481fb9..2f35e8b 100644 --- a/App/AppDelegate.swift +++ b/App/AppDelegate.swift @@ -105,7 +105,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { title: "Find on Page", action: #selector(ShortcutResponder.findOnPage) ) - : UIKeyCommand() + : UIKeyCommand.null() ), // Refresh diff --git a/App/Utilities/UIKeyCommand+ConvInit.swift b/App/Utilities/UIKeyCommand+ConvInit.swift index ebd61fc..c9fe449 100644 --- a/App/Utilities/UIKeyCommand+ConvInit.swift +++ b/App/Utilities/UIKeyCommand+ConvInit.swift @@ -7,7 +7,15 @@ import UIKit +extension NSObject { + @objc fileprivate func _null() {} +} + extension UIKeyCommand { + public static func null() -> UIKeyCommand { + UIKeyCommand(modifiers: [], input: "", title: "", action: #selector(_null)) + } + convenience init(modifiers: UIKeyModifierFlags, input: String, title: String, action: Selector) { self.init(input: input, modifierFlags: modifiers, action: action) self.title = title diff --git a/SBrowser.xcodeproj/project.pbxproj b/SBrowser.xcodeproj/project.pbxproj index 3ef6495..aa4721c 100644 --- a/SBrowser.xcodeproj/project.pbxproj +++ b/SBrowser.xcodeproj/project.pbxproj @@ -791,10 +791,8 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "App/Supporting Files/SBrowser.entitlements"; CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 4; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = DQQH5H6GBD; INFOPLIST_FILE = "App/Supporting Files/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -820,10 +818,8 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "App/Supporting Files/SBrowser.entitlements"; CODE_SIGN_IDENTITY = "-"; - CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 4; DEAD_CODE_STRIPPING = YES; - DEVELOPMENT_TEAM = DQQH5H6GBD; INFOPLIST_FILE = "App/Supporting Files/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/SBrowser.xcodeproj/xcshareddata/xcschemes/App.xcscheme b/SBrowser.xcodeproj/xcshareddata/xcschemes/App.xcscheme index 16d2893..5f1a4cb 100644 --- a/SBrowser.xcodeproj/xcshareddata/xcschemes/App.xcscheme +++ b/SBrowser.xcodeproj/xcshareddata/xcschemes/App.xcscheme @@ -15,7 +15,7 @@ @@ -46,7 +46,7 @@ @@ -70,7 +70,7 @@