Merge pull request #1699 from ToddLa/ios-13-tweak

Ios 13 UX tweaks
Provenance-Emu · Jan 9, 2022 · a64e2e8 · a64e2e8
2 parents 4f0e3c0 + c331ebc
commit a64e2e8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/Provenance/Emulator/PVEmulatorViewController.swift b/Provenance/Emulator/PVEmulatorViewController.swift
@@ -878,6 +878,14 @@ extension NSNumber {
 
 extension GCController {
     func setupPauseHandler(onPause: @escaping () -> Void) {
+        // Use buttonHome for iOS/tvOS14 and later
+        if let buttonHome = buttonHome {
+            buttonHome.pressedChangedHandler = { _, _, isPressed in
+                if isPressed {
+                    onPause()
+                }
+            }
+        }
         // Using buttonMenu is the recommended way for iOS/tvOS13 and later
         if let buttonMenu = buttonMenu {
             buttonMenu.pressedChangedHandler = { _, _, isPressed in
@@ -887,7 +895,8 @@ extension GCController {
             }
         } else {
             // Fallback to the old method
-            controllerPausedHandler = { _ in onPause()
+            controllerPausedHandler = { _ in
+                onPause()
 			}
         }
     }
@@ -902,4 +911,11 @@ extension GCController {
         }
         return nil
     }
+
+    private var buttonHome: GCControllerButtonInput? {
+        if #available(iOS 14.0, tvOS 14.0, *) {
+            return extendedGamepad?.buttonHome
+        }
+        return nil
+    }
 }
diff --git a/Provenance/Game Library/UI/QuickTableViewController/QuickTableViewController.swift b/Provenance/Game Library/UI/QuickTableViewController/QuickTableViewController.swift
@@ -33,7 +33,17 @@ open class QuickTableViewController: UIViewController, UITableViewDataSource, UI
   open var clearsSelectionOnViewWillAppear = true
 
   /// Returns the table view managed by the controller object.
-  open var tableView: UITableView = UITableView(frame: .zero, style: .grouped)
+    #if os(iOS) || os(macOS)
+        open var tableView: UITableView = {
+            if #available(iOS 13.0, *) {
+                return UITableView(frame: .zero, style: .insetGrouped)
+            } else {
+                return UITableView(frame: .zero, style: .grouped)
+            }
+        }()
+    #else
+        open var tableView: UITableView = UITableView(frame: .zero, style: .grouped)
+    #endif
 
   /// The layout of sections and rows to display in the table view.
   open var tableContents: [Section] = [] {

diff --git a/Provenance/Provenance-Info.plist b/Provenance/Provenance-Info.plist
@@ -205,6 +205,8 @@
 	</array>
 	<key>UISupportsDocumentBrowser</key>
 	<true/>
+	<key>UIUserInterfaceStyle</key>
+	<string>Dark</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>