Use SwiftUI persistent overlays for gameplay chrome

Author: J1coding

app/src/main/swift/Models/AppState.swift

@@ -40,13 +40,6 @@ final class AppState: @unchecked Sendable {
             }
         }
     }
-    var hideHomeIndicator: Bool = false {
-        didSet {
-            if oldValue != hideHomeIndicator {
-                NotificationCenter.default.post(name: Self.systemChromeNeedsUpdateNotification, object: nil)
-            }
-        }
-    }
 
     @ObservationIgnored private var pendingBootAction: (() -> Void)?
     @ObservationIgnored private var shutdownObserver: NSObjectProtocol?

app/src/main/swift/Models/SwiftUIHost.swift

@@ -9,9 +9,6 @@ class ARMSX2HostingController<Content: View>: UIHostingController<Content> {
     override var prefersStatusBarHidden: Bool {
         AppState.shared.hideStatusBar
     }
-    override var prefersHomeIndicatorAutoHidden: Bool {
-        AppState.shared.hideStatusBar || AppState.shared.hideHomeIndicator
-    }
     override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
         .fade
     }
@@ -57,7 +54,6 @@ class ARMSX2HostingController<Content: View>: UIHostingController<Content> {
 
     @objc private func systemChromeNeedsUpdate() {
         setNeedsStatusBarAppearanceUpdate()
-        setNeedsUpdateOfHomeIndicatorAutoHidden()
     }
 
     private func applyNativeContentScale(to view: UIView) {
@@ -72,76 +68,18 @@ class ARMSX2HostingController<Content: View>: UIHostingController<Content> {
 }
 
 
-// ARMSX2_ALUNE_STYLE_HOME_BAR_V3_BEGIN
-// Alune does the Home/Gesture Bar part from the active emulation UIViewController itself:
-// its emulation controller directly overrides prefersHomeIndicatorAutoHidden.
-// ARMSX2 is SwiftUI-driven, so this root container presents GameScreenView inside a
-// dedicated UIKit controller when AppState.currentScreen == .playing.
 @MainActor
 private final class ARMSX2GameplayHostingController<Content: View>: UIHostingController<Content> {
-    private var refreshTimer: Timer?
-
     override var prefersStatusBarHidden: Bool {
         AppState.shared.hideStatusBar
     }
 
-    override var prefersHomeIndicatorAutoHidden: Bool {
-        true
-    }
-
-    override var preferredScreenEdgesDeferringSystemGestures: UIRectEdge {
-        .all
-    }
-
-    override var childForHomeIndicatorAutoHidden: UIViewController? {
-        nil
-    }
-
-    override var childForScreenEdgesDeferringSystemGestures: UIViewController? {
-        nil
-    }
-
     override func viewDidLoad() {
         super.viewDidLoad()
         modalPresentationCapturesStatusBarAppearance = true
         view.backgroundColor = .black
         view.isOpaque = true
     }
-
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        refreshSystemGestureChrome()
-    }
-
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        refreshSystemGestureChrome()
-        // iOS may briefly re-evaluate the Home Indicator after SwiftUI/Metal view changes
-        // or after the app becomes active. Keep nudging UIKit while the gameplay controller
-        // is the active full-screen controller, like a game view controller would do.
-        refreshTimer?.invalidate()
-        // Swift 6 / Xcode 16 fix: avoid calling a @MainActor UIKit method from
-        // Timer's @Sendable closure. Use target/selector on the main run loop instead.
-        let timer = Timer(timeInterval: 0.75,
-                          target: self,
-                          selector: #selector(refreshSystemGestureChrome),
-                          userInfo: nil,
-                          repeats: true)
-        refreshTimer = timer
-        RunLoop.main.add(timer, forMode: .common)
-    }
-
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        refreshTimer?.invalidate()
-        refreshTimer = nil
-    }
-
-    @objc func refreshSystemGestureChrome() {
-        setNeedsStatusBarAppearanceUpdate()
-        setNeedsUpdateOfHomeIndicatorAutoHidden()
-        setNeedsUpdateOfScreenEdgesDeferringSystemGestures()
-    }
 }
 
 @MainActor
@@ -153,22 +91,6 @@ private final class ARMSX2RootContainerController: UIViewController {
         AppState.shared.hideStatusBar
     }
 
-    override var prefersHomeIndicatorAutoHidden: Bool {
-        AppState.shared.currentScreen == .playing || AppState.shared.hideHomeIndicator
-    }
-
-    override var preferredScreenEdgesDeferringSystemGestures: UIRectEdge {
-        (AppState.shared.currentScreen == .playing || AppState.shared.hideHomeIndicator) ? .all : []
-    }
-
-    override var childForHomeIndicatorAutoHidden: UIViewController? {
-        gameplayController ?? presentedViewController ?? menuController
-    }
-
-    override var childForScreenEdgesDeferringSystemGestures: UIViewController? {
-        gameplayController ?? presentedViewController ?? menuController
-    }
-
     override var childForStatusBarHidden: UIViewController? {
         gameplayController ?? presentedViewController ?? menuController
     }
@@ -205,7 +127,7 @@ private final class ARMSX2RootContainerController: UIViewController {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         updateGameplayPresentation(animated: false)
-        refreshSystemChrome()
+        refreshStatusBarAppearance()
     }
 
     private func embedMenuController() {
@@ -225,11 +147,11 @@ private final class ARMSX2RootContainerController: UIViewController {
 
     @objc private func emulationPresentationNeedsUpdate() {
         updateGameplayPresentation(animated: false)
-        refreshSystemChrome()
+        refreshStatusBarAppearance()
     }
 
     @objc private func systemChromeNeedsUpdate() {
-        refreshSystemChrome()
+        refreshStatusBarAppearance()
     }
 
     private func updateGameplayPresentation(animated: Bool) {
@@ -243,41 +165,33 @@ private final class ARMSX2RootContainerController: UIViewController {
                 controller.modalPresentationCapturesStatusBarAppearance = true
                 gameplayController = controller
                 present(controller, animated: animated) { [weak self, weak controller] in
-                    controller?.refreshSystemGestureChrome()
-                    self?.refreshSystemChrome()
+                    controller?.setNeedsStatusBarAppearanceUpdate()
+                    self?.refreshStatusBarAppearance()
                 }
             } else {
-                gameplayController?.refreshSystemGestureChrome()
+                gameplayController?.setNeedsStatusBarAppearanceUpdate()
             }
         } else if let controller = gameplayController {
             gameplayController = nil
             controller.dismiss(animated: animated) { [weak self] in
-                self?.refreshSystemChrome()
+                self?.refreshStatusBarAppearance()
             }
         }
     }
 
-    private func refreshSystemChrome() {
+    private func refreshStatusBarAppearance() {
         setNeedsStatusBarAppearanceUpdate()
-        setNeedsUpdateOfHomeIndicatorAutoHidden()
-        setNeedsUpdateOfScreenEdgesDeferringSystemGestures()
-        gameplayController?.refreshSystemGestureChrome()
+        gameplayController?.setNeedsStatusBarAppearanceUpdate()
         DispatchQueue.main.async { [weak self] in
             self?.setNeedsStatusBarAppearanceUpdate()
-            self?.setNeedsUpdateOfHomeIndicatorAutoHidden()
-            self?.setNeedsUpdateOfScreenEdgesDeferringSystemGestures()
-            self?.gameplayController?.refreshSystemGestureChrome()
+            self?.gameplayController?.setNeedsStatusBarAppearanceUpdate()
         }
     }
 }
-// ARMSX2_ALUNE_STYLE_HOME_BAR_V3_END
 
 @objc public class SwiftUIHost: NSObject {
     @MainActor
     @objc public static func createMenuController() -> UIViewController {
-        // ARMSX2_ALUNE_STYLE_HOME_BAR_V3
-        // Return a UIKit root container. The menu remains SwiftUI, but gameplay/BIOS is
-        // presented by a dedicated full-screen UIViewController, matching Alune's model.
         return ARMSX2RootContainerController()
     }
 }

app/src/main/swift/Views/GameScreenView.swift

@@ -113,7 +113,6 @@ struct GameScreenView: View {
     @State private var retroAchievementsToastGeneration = 0
     @State private var retroAchievementsToastDismissTask: Task<Void, Never>?
     @State private var runtimeOverlayPauseActive = false
-    @State private var previousHideHomeIndicator = false
 
     @Environment(\.scenePhase) private var scenePhase
 
@@ -242,7 +241,6 @@ struct GameScreenView: View {
             Text(settings.localized("Restart the current game? Unsaved progress will be lost."))
         }
         .onAppear {
-            enterGameplaySystemChromeMode()
             AppState.requestEmulationPresentationUpdate()
             syncFullscreenStateFromWindow()
             applyInitialFullscreenPreference()
@@ -252,7 +250,6 @@ struct GameScreenView: View {
         .onDisappear {
             statusMessageDismissTask?.cancel()
             retroAchievementsToastDismissTask?.cancel()
-            leaveGameplaySystemChromeMode()
         }
         .simultaneousGesture(
             TapGesture(count: 2).onEnded {
@@ -687,15 +684,6 @@ struct GameScreenView: View {
 
     // MARK: - Lifecycle & Events
 
-    private func enterGameplaySystemChromeMode() {
-        previousHideHomeIndicator = appState.hideHomeIndicator
-        appState.hideHomeIndicator = true
-    }
-
-    private func leaveGameplaySystemChromeMode() {
-        appState.hideHomeIndicator = previousHideHomeIndicator
-    }
-
     private func applyInitialFullscreenPreference() {
         menuButtonHidden = settings.hideMenuButton
         if settings.autoFullscreen && !ARMSX2Bridge.isSDLFullscreen() {