Skip to content

1.3.3 #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alexander72i wants to merge 9 commits into
base: 1.3.1
Choose a base branch
from
Open

1.3.3 #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41f8c78
Fixes BIOSError compilation error when compiling with Xcode 13
rileytestut Aug 9, 2021
576317f
Fixes keyboard support on iOS 15+
rileytestut Apr 26, 2022
0bd836c
Fixes ControllerInputsViewController’s system picker UI
rileytestut Jun 1, 2022
d85d630
Fixes not detecting keyboard presses when remapping inputs
rileytestut Aug 11, 2022
8be02b8
Fixes displaying system name in dark text when remapping inputs on iO…
rileytestut Aug 15, 2022
9154445
Fixes previous game controller remaining selected when changing contr…
rileytestut May 9, 2022
5be9f81
Updates app version to 1.3.2
rileytestut Sep 20, 2022
0f7e123
Fixes implicit Double -> CGFloat compiler error with Xcode 12
rileytestut Oct 19, 2022
369077b
Updates bundle version to 54
rileytestut Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cores/DeltaCore
Open in desktop
Submodule DeltaCore updated 4 files
+1 −1 DeltaCore/Cores/DeltaCoreProtocol.swift
+36 −11 DeltaCore/Game Controllers/ExternalGameControllerManager.swift
+4 −4 DeltaCore/Game Controllers/Keyboard/KeyboardResponder.swift
+22 −1 DeltaCore/UI/Controller/ControllerView.swift
8 changes: 4 additions & 4 deletions Delta.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,11 +1422,11 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 46;
CURRENT_PROJECT_VERSION = 54;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "Delta/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.3.1;
MARKETING_VERSION = 1.3.2;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DDEBUG";
PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.Delta;
PROVISIONING_PROFILE = "";
Expand All @@ -1451,11 +1451,11 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 46;
CURRENT_PROJECT_VERSION = 54;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "Delta/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.3.1;
MARKETING_VERSION = 1.3.2;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DIMPACTOR";
PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.Delta;
PROVISIONING_PROFILE = "";
Expand Down
3 changes: 2 additions & 1 deletion Delta/Components/Popover Menu/ListMenuViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ class ListMenuViewController: UITableViewController

override var preferredContentSize: CGSize {
get {
let navigationBarHeight = self.navigationController?.navigationBar.bounds.height ?? 0.0
// Don't include navigation bar height in calculation (as of iOS 13).
let navigationBarHeight: CGFloat = 0.0 // self.navigationController?.navigationBar.bounds.height ?? 0.0
return CGSize(width: 0, height: (self.tableView.rowHeight * CGFloat(self.items.count)) + navigationBarHeight)
}
set {}
Expand Down
18 changes: 15 additions & 3 deletions Delta/Components/Popover Menu/PopoverMenuButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,23 @@ extension UINavigationBar
private var _defaultTitleTextAttributes: [NSAttributedString.Key: Any]? {
guard self.titleTextAttributes == nil else { return self.titleTextAttributes }

guard
let contentView = self.subviews.first(where: { NSStringFromClass(type(of: $0)).contains("ContentView") || NSStringFromClass(type(of: $0)).contains("ItemView") }),
let titleLabel = contentView.subviews.first(where: { $0 is UILabel }) as? UILabel
guard let contentView = self.subviews.first(where: { NSStringFromClass(type(of: $0)).contains("ContentView") || NSStringFromClass(type(of: $0)).contains("ItemView") })
else { return nil }

let containerView: UIView

if #available(iOS 16, *)
{
guard let titleControl = contentView.subviews.first(where: { NSStringFromClass(type(of: $0)).contains("Title") }) else { return nil }
containerView = titleControl
}
else
{
containerView = contentView
}

guard let titleLabel = containerView.subviews.first(where: { $0 is UILabel }) as? UILabel else { return nil }

let textAttributes = titleLabel.attributedText?.attributes(at: 0, effectiveRange: nil)
return textAttributes
}
Expand Down
7 changes: 7 additions & 0 deletions Delta/Settings/Controllers/ControllerInputsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ class ControllerInputsViewController: UIViewController
{
self.prepareCallouts()
}

// controllerView must be first responder to receive keyboard presses.
self.gameViewController.controllerView.becomeFirstResponder()
}
}

Expand Down Expand Up @@ -183,6 +186,10 @@ private extension ControllerInputsViewController
listMenuViewController.title = NSLocalizedString("Game System", comment: "")

let navigationController = UINavigationController(rootViewController: listMenuViewController)
if #available(iOS 13, *)
{
navigationController.navigationBar.scrollEdgeAppearance = navigationController.navigationBar.standardAppearance
}

let popoverMenuController = PopoverMenuController(popoverViewController: navigationController)
self.navigationItem.popoverMenuController = popoverMenuController
Expand Down
4 changes: 3 additions & 1 deletion Delta/Settings/Controllers/ControllersSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ extension ControllersSettingsViewController
{
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath)
{
let previousGameController = self.gameController

switch Section(rawValue: indexPath.section)!
{
case .localDevice: self.gameController = self.localDeviceController
Expand All @@ -310,7 +312,7 @@ extension ControllersSettingsViewController

let previousIndexPath: IndexPath?

if let gameController = self.gameController
if let gameController = previousGameController
{
if gameController == self.localDeviceController
{
Expand Down
3 changes: 1 addition & 2 deletions Delta/Settings/Cores/MelonDSCoreSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,12 @@ private extension MelonDSCoreSettingsViewController
case changeCore
}

@available(iOS 13, *)
enum BIOSError: LocalizedError
{
case unknownSize(URL)
case incorrectHash(URL, hash: String, expectedHash: String)
case unsupportedHash(URL, hash: String)

@available(iOS 13, *)
case incorrectSize(URL, size: Int, validSizes: Set<ClosedRange<Measurement<UnitInformationStorage>>>)

private static let byteFormatter: ByteCountFormatter = {
Expand Down