silence retro conformance warning; refactor some vars

Author: bdeweygit

SwiftUIProject/UnitySwiftUI/ContentView.swift

@@ -11,31 +11,31 @@ struct ContentView: View {
     @State private var loading = false
     @State private var showState = false
     @State private var showLayout = false
-    @State private var playerDisplay = Display.square
-    @State private var playerAlignment = Alignment.top
+    @State private var display = Display.square
+    @State private var alignment = Alignment.top
 
     @ObservedObject private var unity = Unity.shared
 
     var body: some View {
         ZStack(alignment: .bottomLeading, content: {
-            if loading { // Unity is starting up
+            if loading {
+                // Unity is starting up or shutting down
                 ProgressView("Loading...").tint(.white).foregroundStyle(.white)
-            } else if let unityView = unity.view { // Unity is running
-                // Create a container for Unity's UIView.
-                let UnityContainer = UIViewContainer(containee: unityView)
-                switch playerDisplay {
+            } else if let UnityContainer = unity.view.flatMap({ UIViewContainer(containee: $0) }) {
+                // Unity is running
+                switch display {
                 case .fullscreen:
                     UnityContainer.ignoresSafeArea()
                 case .safearea:
                     UnityContainer
                 case .aspect, .square:
-                    let isAspect = playerDisplay == .aspect
+                    let isAspect = display == .aspect
                     GeometryReader(content: { geometry in
                         let aspect = geometry.size.applying(CGAffineTransform(scaleX: 0.5, y: 0.5))
                         let square = min(aspect.width, aspect.height)
                         let width = isAspect ? aspect.width : square
                         let height = isAspect ? aspect.height : square
-                        UnityContainer.frame(width: width, height: height).frame(maxWidth: .infinity, maxHeight: .infinity, alignment: playerAlignment)
+                        UnityContainer.frame(width: width, height: height).frame(maxWidth: .infinity, maxHeight: .infinity, alignment: alignment)
                     })
                 }
                 VStack(alignment: .leading, content: {
@@ -62,14 +62,14 @@ struct ContentView: View {
                                 })
                             }
                             if showLayout {
-                                Picker("Player display", selection: $playerDisplay, content: {
+                                Picker("Display", selection: $display, content: {
                                     Text("Square").tag(Display.square)
                                     Text("Aspect").tag(Display.aspect)
                                     Text("Safe area").tag(Display.safearea)
                                     Text("Fullscreen").tag(Display.fullscreen)
                                 })
-                                if playerDisplay == .aspect || playerDisplay == .square {
-                                    Picker("Player alignment", selection: $playerAlignment, content: {
+                                if display == .aspect || display == .square {
+                                    Picker("Alignment", selection: $alignment, content: {
                                         Text("Top").tag(Alignment.top)
                                         Text("Center").tag(Alignment.center)
                                         Text("Bottom").tag(Alignment.bottom)
@@ -100,7 +100,8 @@ struct ContentView: View {
                         })
                     })
                 })
-            } else { // Unity is not running
+            } else {
+                // Unity is not running
                 Button("Start Unity", systemImage: "play", action: {
                     /* Unity startup is slow and must must occur on the
                        main thread. Use async dispatch so we can re-render
@@ -132,8 +133,10 @@ fileprivate struct CustomButtonStyle: PrimitiveButtonStyle {
 }
 
 /* Make alignment hashable so it can be used as a
-   picker selection. We only care about top, center, and bottom. */
-extension Alignment: Hashable {
+   picker selection. We only care about top, center,
+   and bottom. Retroactive conformance is a bad practice
+   but is much more laconic than writing out a wrapper type. */
+extension Alignment: @retroactive Hashable {
     public func hash(into hasher: inout Hasher) {
         switch self {
         case .top: hasher.combine(0)

SwiftUIProject/UnitySwiftUI/Unity.swift

@@ -55,7 +55,7 @@ class Unity: SetsNativeState, ObservableObject  {
         })
         loadingGroup.wait()
 
-        /* The player finishes starting - runEmbedded() returns - before completing
+        /* Unity finishes starting - runEmbedded() returns - before completing
            its first render. If the view is displayed immediately it often shows the
            content leftover from the previous run until Unity renders again and overwrites it.
            Clearing Unity's layer with transparent color before restart hides this brief artifact. */
@@ -79,7 +79,7 @@ class Unity: SetsNativeState, ObservableObject  {
             }
         }
 
-        // Start the player
+        // Start Unity
         framework.runEmbedded(withArgc: CommandLine.argc, argv: CommandLine.unsafeArgv, appLaunchOpts: nil)
 
         // Hide Unity's UIWindow so it won't display UIView or intercept touches