Merge branch 'develop' of github.com:willowtreeapps/eyespeak-ios into…

… bugfix/792-move-compact-qwerty-preference # Conflicts: # Vocable.xcodeproj/project.pbxproj
willowtreeapps · Sep 4, 2024 · cff9b7f · cff9b7f
2 parents 8f0e684 + c510690
commit cff9b7f
Show file tree

Hide file tree

Showing 63 changed files with 3,189 additions and 1,472 deletions.
diff --git a/Tests/VocableUITests/Screens/KeyboardScreen.swift b/Tests/VocableUITests/Screens/KeyboardScreen.swift
@@ -11,7 +11,7 @@ import XCTest
 class KeyboardScreen: BaseScreen {
     private static let app = XCUIApplication()
 
-    static let keyboardCollectionView = XCUIApplication().collectionViews[.shared.keyboard.collectionView]
+    static let keyboardView = XCUIApplication().otherElements[.shared.keyboard.view]
     static let keyboardTextView = XCUIApplication().textViews[.shared.keyboard.outputTextView]
     static let favoriteButton = XCUIApplication().buttons[.shared.keyboard.favoriteButton]
     static let checkmarkAddButton = XCUIApplication().buttons[.shared.keyboard.saveButton]
@@ -23,7 +23,7 @@ class KeyboardScreen: BaseScreen {
         line: UInt = #line
     ) throws {
         // Ensure the keyboard is visible on screen before tapping any cells
-        try keyboardCollectionView.assertExistence(
+        try keyboardView.assertExistence(
             timeout: 0.5,
             "Failed to locate keyboard",
             file: file,
@@ -33,8 +33,8 @@ class KeyboardScreen: BaseScreen {
         // The entire keyboard is visible by design, so it is okay to
         // not wait for the existence of each cell before tapping. It's
         // a minor optimization, but the savings add up.
-        for char in textToType {
-            keyboardCollectionView.cells[.shared.keyboard.key("\(char)")].tap()
+        for char in textToType.uppercased() {
+            keyboardView.buttons[.shared.keyboard.key(.insertCharacter(char))].tap()
         }
     }
 

diff --git a/Vocable.xcodeproj/project.pbxproj b/Vocable.xcodeproj/project.pbxproj
diff --git a/Vocable.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Vocable.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,17 +6,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/abseil-cpp-binary.git",
       "state" : {
-        "revision" : "748c7837511d0e6a507737353af268484e1745e2",
-        "version" : "1.2024011601.1"
+        "revision" : "194a6706acbd25e4ef639bcaddea16e8758a3e27",
+        "version" : "1.2024011602.0"
       }
     },
     {
       "identity" : "app-check",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/app-check.git",
       "state" : {
-        "revision" : "076b241a625e25eac22f8849be256dfb960fcdfe",
-        "version" : "10.19.1"
+        "revision" : "3b62f154d00019ae29a71e9738800bb6f18b236d",
+        "version" : "10.19.2"
       }
     },
     {
@@ -33,26 +33,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
       "state" : {
-        "revision" : "c9c3df6ab812de32bae61fc0cd1bf6d45170ebf0",
-        "version" : "1.8.2"
+        "revision" : "678d442c6f7828def400a70ae15968aef67ef52d",
+        "version" : "1.8.3"
       }
     },
     {
       "identity" : "firebase-ios-sdk",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/firebase/firebase-ios-sdk",
       "state" : {
-        "revision" : "9d17b500cd98d9a7009751ad62f802e152e97021",
-        "version" : "10.26.0"
+        "revision" : "eca84fd638116dd6adb633b5a3f31cc7befcbb7d",
+        "version" : "10.29.0"
       }
     },
     {
       "identity" : "googleappmeasurement",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleAppMeasurement.git",
       "state" : {
-        "revision" : "16244d177c4e989f87b25e9db1012b382cfedc55",
-        "version" : "10.25.0"
+        "revision" : "fe727587518729046fc1465625b9afd80b5ab361",
+        "version" : "10.28.0"
       }
     },
     {
@@ -87,8 +87,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/gtm-session-fetcher.git",
       "state" : {
-        "revision" : "0382ca27f22fb3494cf657d8dc356dc282cd1193",
-        "version" : "3.4.1"
+        "revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
+        "version" : "3.5.0"
       }
     },
     {
@@ -115,7 +115,7 @@
       "location" : "https://github.com/mixpanel/mixpanel-swift",
       "state" : {
         "branch" : "master",
-        "revision" : "e7869c433ee01cdc52aa14abf636fe0b412d72f8"
+        "revision" : "61ce9b40817466fb1334db1d7a582fbaf616ab4c"
       }
     },
     {
@@ -159,17 +159,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser.git",
       "state" : {
-        "revision" : "46989693916f56d1186bd59ac15124caef896560",
-        "version" : "1.3.1"
+        "revision" : "41982a3656a71c768319979febd796c6fd111d5c",
+        "version" : "1.5.0"
       }
     },
     {
       "identity" : "swift-collections",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections.git",
       "state" : {
-        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
-        "version" : "1.1.0"
+        "revision" : "3d2dc41a01f9e49d84f0a3925fb858bed64f702d",
+        "version" : "1.1.2"
       }
     },
     {
@@ -186,26 +186,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-protobuf.git",
       "state" : {
-        "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
-        "version" : "1.26.0"
+        "revision" : "e17d61f26df0f0e06f58f6977ba05a097a720106",
+        "version" : "1.27.1"
       }
     },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax.git",
+      "location" : "https://github.com/swiftlang/swift-syntax.git",
       "state" : {
-        "revision" : "303e5c5c36d6a558407d364878df131c3546fad8",
-        "version" : "510.0.2"
+        "revision" : "82a453c2dfa335c7e778695762438dfe72b328d2",
+        "version" : "600.0.0-prerelease-2024-07-24"
       }
     },
     {
       "identity" : "swiftlint",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/realm/SwiftLint.git",
       "state" : {
-        "revision" : "b515723b16eba33f15c4677ee65f3fef2ce8c255",
-        "version" : "0.55.1"
+        "revision" : "586dd54db496cbcc03c1aaddb3078bab19de5739",
+        "version" : "0.56.1"
       }
     },
     {
@@ -240,8 +240,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/jpsim/Yams.git",
       "state" : {
-        "revision" : "9234124cff5e22e178988c18d8b95a8ae8007f76",
-        "version" : "5.1.2"
+        "revision" : "3036ba9d69cf1fd04d433527bc339dc0dc75433d",
+        "version" : "5.1.3"
       }
     }
   ],

diff --git a/Vocable/Common/TextEditorViewController.swift b/Vocable/Common/TextEditorViewController.swift
diff --git a/Vocable/Common/Views/GazeableAlertController/GazeableAlertViewController.swift b/Vocable/Common/Views/GazeableAlertController/GazeableAlertViewController.swift
@@ -190,7 +190,7 @@ private final class GazeableAlertButton: GazeableButton {
 
         if state.contains(.selected) {
             foregroundColor = .white
-            backgroundColor = .primaryColor
+            backgroundColor = .selectedCellBackground
         } else if case .destructive = actionStyle {
             foregroundColor = .errorRed
             backgroundColor = .clear