merge

.github/workflows/ios.yml

@@ -0,0 +1,44 @@
+name: iOS starter workflow
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    name: Build and Test default scheme using any available iPhone simulator
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set Default Scheme
+        run: |
+          scheme_list=$(xcodebuild -list -json | tr -d "\n")
+          default=$(echo $scheme_list | ruby -e "require 'json'; puts JSON.parse(STDIN.gets)['project']['targets'][0]")
+          echo $default | cat >default
+          echo Using default scheme: $default
+      - name: Build
+        env:
+          scheme: ${{ 'default' }}
+          platform: ${{ 'iOS Simulator' }}
+        run: |
+          # xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
+          device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
+          if [ $scheme = default ]; then scheme=$(cat default); fi
+          if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
+          file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
+          xcodebuild build-for-testing -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"
+      - name: Test
+        env:
+          scheme: ${{ 'default' }}
+          platform: ${{ 'iOS Simulator' }}
+        run: |
+          # xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
+          device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
+          if [ $scheme = default ]; then scheme=$(cat default); fi
+          if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
+          file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
+          xcodebuild test-without-building -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"

.gitignore

@@ -2,8 +2,10 @@
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
+.DS_Store
+
 ## User settings
-xcuserdata/
+Cards.xcodeproj/project.xcworkspace/xcuserdata/
 *.plist
 
 ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)

Cards-Bridging-Header.h

@@ -0,0 +1,21 @@
+//
+//  Cards-Bridging-Header.h
+//  EarlGrey
+//
+//  Created by Daniel Wells on 11/27/23.
+//
+
+#ifndef Cards_Bridging_Header_h
+#define Cards_Bridging_Header_h
+
+#import "../eDistantObject/Channel/Sources/EDOHostPort.h"
+#import "AppFramework/Action/GREYAction.h"
+#import "AppFramework/Action/GREYActionBlock.h"
+#import "AppFramework/Action/GREYActions.h"
+#import "CommonLib/DistantObject/GREYHostApplicationDistantObject.h"
+#import "CommonLib/Matcher/GREYElementMatcherBlock.h"
+#import "CommonLib/Matcher/GREYMatcher.h"
+#import "TestLib/AlertHandling/XCTestCase+GREYSystemAlertHandler.h"
+#import "TestLib/EarlGrey.h"
+
+#endif /* Cards_Bridging_Header_h */

Cards.xcodeproj/xcshareddata/xcschemes/Cards.xcscheme

@@ -51,6 +51,17 @@
                ReferencedContainer = "container:Cards.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1E114CC42B151B8B00503368"
+               BuildableName = "EarlGreyTests.xctest"
+               BlueprintName = "EarlGreyTests"
+               ReferencedContainer = "container:Cards.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Cards.xcodeproj/xcuserdata/wells.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,4 +3,22 @@
    uuid = "52D84923-A4D3-49DB-B62A-CB6DDE57D9AC"
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6F341A58-BBFC-4853-BC7A-23992093E7F4"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Cards/views/LoadingScreen.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "70"
+            endingLineNumber = "70"
+            landmarkName = "equalNumOfPlayersOnTeam(players:)"
+            landmarkType = "9">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

Cards.xcodeproj/xcuserdata/wells.xcuserdatad/xcschemes/Copy of Cards.xcscheme

@@ -51,6 +51,17 @@
                ReferencedContainer = "container:Cards.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1E114CC42B151B8B00503368"
+               BuildableName = "EarlGreyTests.xctest"
+               BlueprintName = "EarlGreyTests"
+               ReferencedContainer = "container:Cards.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Cards.xcodeproj/xcuserdata/wells.xcuserdatad/xcschemes/Copy of Copy of Cards.xcscheme

@@ -60,6 +60,17 @@
                ReferencedContainer = "container:Cards.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "1E114CC42B151B8B00503368"
+               BuildableName = "EarlGreyTests.xctest"
+               BlueprintName = "EarlGreyTests"
+               ReferencedContainer = "container:Cards.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Cards.xcodeproj/xcuserdata/wells.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,38 +7,38 @@
 		<key>Cards.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>4</integer>
 		</dict>
 		<key>Copy of Cards.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 		<key>Copy of Copy of Cards.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>3</integer>
 		</dict>
 		<key>Promises (Playground) 1.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>9</integer>
 		</dict>
 		<key>Promises (Playground) 2.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>10</integer>
 		</dict>
 		<key>Promises (Playground).xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>8</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

Cards/CardsApp.swift

@@ -22,7 +22,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 struct CardsApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var delegate
     @StateObject private var firebaseHelper = FirebaseHelper()
-
+        
     var body: some Scene {
         WindowGroup {
             ContentView()

Cards/ContentView.swift

@@ -8,16 +8,16 @@
 import SwiftUI
 
 struct ContentView: View {
+    @EnvironmentObject var firebaseHelper: FirebaseHelper
     @State var universalClicked = "A game"
     var body: some View {
-        NavigationView {
+        NavigationStack {
             VStack {
                 Text("What game do you want to play??")
                 GameButton(universalClicked: $universalClicked, gameName: "cribbage")
                 GameButton(universalClicked: $universalClicked, gameName: "uno")
                 GameButton(universalClicked: $universalClicked, gameName: "rummy")
             }
-            .buttonStyle(.bordered)
         }
     }
 }