AXComponentKit 2.0: Swift 6, @AXScreen macro, dynamic component enhancements

.swiftpm/xcode/xcshareddata/xcschemes/AXComponentKitMacrosTests.xcscheme

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1610"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AXComponentKitMacrosTests"
+               BuildableName = "AXComponentKitMacrosTests"
+               BlueprintName = "AXComponentKitMacrosTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AXComponentKitMacrosTests"
+               BuildableName = "AXComponentKitMacrosTests"
+               BlueprintName = "AXComponentKitMacrosTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+</Scheme>

AXComponentKitSample/AXComponentKitSample.xcodeproj/xcshareddata/xcschemes/AXComponentKitSample.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1410"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,6 +27,12 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:UITests/AXComponentKitSample.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO"

AXComponentKitSample/AXComponentKitSample/AXComponentKitSampleApp.swift

@@ -1,10 +1,12 @@
+import AXComponentKit
 import SwiftUI
 
 @main
 struct AXComponentKitSampleApp: App {
     var body: some Scene {
         WindowGroup {
             ContentView()
+                .automationOptimized()
         }
     }
 }

AXComponentKitSample/AXComponentKitSample/AXScreens/CatalogScreen.swift

@@ -0,0 +1,10 @@
+import AXComponentKit
+import AXComponentKitMacroSupport
+
+@AXScreen
+struct CatalogScreen {
+    let featuredCarousel: AXScrollView = "catalog-featured-carousel"
+    let categoryList: AXScrollView = "catalog-category-list"
+    let categoryCard: AXDynamicComponent<Category> = "catalog-category-card"
+    let featuredItem: AXDynamicComponent<Int> = "catalog-featured-item"
+}

AXComponentKitSample/AXComponentKitSample/AXScreens/Category.swift

@@ -0,0 +1,18 @@
+import AXComponentKit
+import Foundation
+
+enum Category: String, CaseIterable, AXDynamicValue {
+    case electronics
+    case books
+    case clothing
+
+    var automationDynamicValue: String { rawValue }
+
+    var displayName: String {
+        switch self {
+        case .electronics: "Electronics"
+        case .books: "Books"
+        case .clothing: "Clothing"
+        }
+    }
+}

AXComponentKitSample/AXComponentKitSample/AXScreens/CategoryDetailScreen.swift

@@ -0,0 +1,8 @@
+import AXComponentKit
+import AXComponentKitMacroSupport
+
+@AXScreen
+struct CategoryDetailScreen {
+    let itemList: AXScrollView = "category-detail-item-list"
+    let item: AXDynamicComponent<Int> = "category-detail-item"
+}

AXComponentKitSample/AXComponentKitSample/AXScreens/DetailScreen.swift

@@ -1,8 +1,7 @@
 import AXComponentKit
-import Foundation
-
-struct DetailScreen: AXScreen {
-    static let screenIdentifier = "detail-screen"
+import AXComponentKitMacroSupport
 
+@AXScreen
+struct DetailScreen {
     let contentLabel: AXComponent = "content-label"
 }

AXComponentKitSample/AXComponentKitSample/AXScreens/FirstTabScreen.swift

@@ -1,8 +1,7 @@
 import AXComponentKit
-import Foundation
-
-struct FirstTabScreen: AXScreen {
-    static let screenIdentifier = "first-tab-screen"
+import AXComponentKitMacroSupport
 
+@AXScreen
+struct FirstTabScreen {
     let detailButton: AXComponent = "first-tab-screen-detail-button"
 }

AXComponentKitSample/AXComponentKitSample/AXScreens/ItemDetailScreen.swift

@@ -0,0 +1,9 @@
+import AXComponentKit
+import AXComponentKitMacroSupport
+
+@AXScreen
+struct ItemDetailScreen {
+    let titleLabel: AXComponent = "item-detail-title-label"
+    let descriptionLabel: AXComponent = "item-detail-description-label"
+    let shareButton: AXComponent = "item-detail-share-button"
+}

AXComponentKitSample/AXComponentKitSample/AXScreens/ProfileScreen.swift

@@ -0,0 +1,9 @@
+import AXComponentKit
+import AXComponentKitMacroSupport
+
+@AXScreen
+struct ProfileScreen {
+    let profileField: AXDynamicComponent<String> = "profile-field"
+    let saveButton: AXComponent = "profile-save-button"
+    let closeButton: AXComponent = "profile-close-button"
+}

AXComponentKitSample/AXComponentKitSample/AXScreens/SecondTabScreen.swift

@@ -1,9 +1,8 @@
 import AXComponentKit
-import Foundation
-
-struct SecondTabScreen: AXScreen {
-    static let screenIdentifier = "second-tab-screen"
+import AXComponentKitMacroSupport
 
+@AXScreen
+struct SecondTabScreen {
     let table: AXScrollView = "second-table-table-view"
     let rowItem: AXDynamicComponent<Int> = "second-tab-dynamic-row"
 }

AXComponentKitSample/AXComponentKitSample/AXScreens/SettingsScreen.swift

@@ -0,0 +1,16 @@
+import AXComponentKit
+import AXComponentKitMacroSupport
+
+@AXScreen
+struct SettingsScreen {
+    let notificationsToggle: AXComponent = "settings-notifications-toggle"
+    let darkModeToggle: AXComponent = "settings-dark-mode-toggle"
+    let locationToggle: AXComponent = "settings-location-toggle"
+    let analyticsToggle: AXComponent = "settings-analytics-toggle"
+    let versionLabel: AXComponent = "settings-version-label"
+    let privacyButton: AXComponent = "settings-privacy-button"
+    let termsButton: AXComponent = "settings-terms-button"
+    let profileButton: AXComponent = "settings-profile-button"
+    let settingsList: AXScrollView = "settings-list-scroll-view"
+    let supportEmail: AXComponent = AXComponent(prefix: "settings", "support-email-label")
+}

AXComponentKitSample/AXComponentKitSample/AXScreens/ShareScreen.swift

@@ -0,0 +1,9 @@
+import AXComponentKit
+import AXComponentKitMacroSupport
+
+@AXScreen
+struct ShareScreen {
+    let messageField: AXComponent = "share-message-field"
+    let sendButton: AXComponent = "share-send-button"
+    let dismissButton: AXComponent = "share-dismiss-button"
+}

AXComponentKitSample/AXComponentKitSample/Views/ContentView.swift

@@ -11,6 +11,14 @@ struct ContentView: View {
                 .tabItem {
                     Label("Second", systemImage: "circle")
                 }
+            SettingsView()
+                .tabItem {
+                    Label("Settings", systemImage: "gear")
+                }
+            CatalogView()
+                .tabItem {
+                    Label("Catalog", systemImage: "square.grid.2x2")
+                }
         }
     }
 }

AXComponentKitSample/AXComponentKitSample/Views/Fourth Tab/CatalogView.swift

@@ -0,0 +1,46 @@
+import AXComponentKit
+import SwiftUI
+
+struct CatalogView: View {
+    @State private var path = NavigationPath()
+
+    private let featuredItems = 1 ... 8
+
+    var body: some View {
+        NavigationStack(path: $path) {
+            List {
+                Section("Featured") {
+                    ScrollView(.horizontal) {
+                        HStack(spacing: 12) {
+                            ForEach(featuredItems, id: \.self) { index in
+                                RoundedRectangle(cornerRadius: 8)
+                                    .fill(Color.blue.opacity(0.2))
+                                    .frame(width: 120, height: 80)
+                                    .overlay(Text("Item \(index)"))
+                                    .automationComponent(\CatalogScreen.featuredItem, value: index)
+                            }
+                        }
+                        .padding(.horizontal)
+                    }
+                    .automationScrollView(\CatalogScreen.featuredCarousel)
+                    .listRowInsets(EdgeInsets())
+                }
+
+                Section("Categories") {
+                    ForEach(Category.allCases, id: \.self) { category in
+                        Button(category.displayName) {
+                            path.append(category)
+                        }
+                        .automationComponent(\CatalogScreen.categoryCard, value: category)
+                    }
+                }
+            }
+            .automationScrollView(\CatalogScreen.categoryList)
+            .navigationTitle("Catalog")
+            .navigationDestination(for: Category.self) { category in
+                CategoryDetailView(category: category)
+            }
+        }
+        .automationScreen(CatalogScreen.self)
+    }
+}

AXComponentKitSample/AXComponentKitSample/Views/Fourth Tab/CategoryDetailView.swift

@@ -0,0 +1,21 @@
+import AXComponentKit
+import SwiftUI
+
+struct CategoryDetailView: View {
+    let category: Category
+    private let items = 1 ... 50
+
+    var body: some View {
+        Form {
+            ForEach(items, id: \.self) { index in
+                NavigationLink("Item \(index)") {
+                    ItemDetailView(itemIndex: index, category: category)
+                }
+                .automationComponent(\CategoryDetailScreen.item, value: index)
+            }
+        }
+        .automationScrollView(\CategoryDetailScreen.itemList)
+        .navigationTitle(category.displayName)
+        .automationScreen(CategoryDetailScreen.self)
+    }
+}

AXComponentKitSample/AXComponentKitSample/Views/Fourth Tab/ItemDetailView.swift

@@ -0,0 +1,32 @@
+import AXComponentKit
+import SwiftUI
+
+struct ItemDetailView: View {
+    let itemIndex: Int
+    let category: Category
+
+    @State private var showShare = false
+
+    var body: some View {
+        Form {
+            Section {
+                Text("Item \(itemIndex) — \(category.displayName)")
+                    .automationComponent(\ItemDetailScreen.titleLabel)
+                Text("This is a detailed description of item \(itemIndex) in the \(category.displayName) category.")
+                    .automationComponent(\ItemDetailScreen.descriptionLabel)
+            }
+
+            Section {
+                Button("Share") {
+                    showShare = true
+                }
+                .automationComponent(\ItemDetailScreen.shareButton)
+            }
+        }
+        .navigationTitle("Item \(itemIndex)")
+        .sheet(isPresented: $showShare) {
+            ShareSheetView()
+        }
+        .automationScreen(ItemDetailScreen.self)
+    }
+}

AXComponentKitSample/AXComponentKitSample/Views/Shared/ShareSheetView.swift

@@ -0,0 +1,35 @@
+import AXComponentKit
+import SwiftUI
+
+struct ShareSheetView: View {
+    @Environment(\.dismiss) private var dismiss
+    @State private var message = ""
+
+    var body: some View {
+        NavigationStack {
+            Form {
+                Section("Message") {
+                    TextField("Add a message…", text: $message, axis: .vertical)
+                        .automationComponent(\ShareScreen.messageField)
+                }
+
+                Section {
+                    Button("Send") {
+                        dismiss()
+                    }
+                    .automationComponent(\ShareScreen.sendButton)
+                }
+            }
+            .navigationTitle("Share")
+            .toolbar {
+                ToolbarItem(placement: .cancellationAction) {
+                    Button("Cancel") {
+                        dismiss()
+                    }
+                    .automationComponent(\ShareScreen.dismissButton)
+                }
+            }
+        }
+        .automationScreen(ShareScreen.self)
+    }
+}

AXComponentKitSample/AXComponentKitSample/Views/Third Tab/ProfileView.swift

@@ -0,0 +1,42 @@
+import AXComponentKit
+import SwiftUI
+
+struct ProfileView: View {
+    @Environment(\.dismiss) private var dismiss
+
+    private let fields = ["name", "email", "phone"]
+
+    @State private var name = "Jane Doe"
+    @State private var email = "jane@example.com"
+    @State private var phone = "555-1234"
+
+    var body: some View {
+        NavigationStack {
+            Form {
+                Section("Personal Information") {
+                    TextField("Name", text: $name)
+                        .automationComponent(\ProfileScreen.profileField, value: "name")
+                    TextField("Email", text: $email)
+                        .automationComponent(\ProfileScreen.profileField, value: "email")
+                    TextField("Phone", text: $phone)
+                        .automationComponent(\ProfileScreen.profileField, value: "phone")
+                }
+
+                Section {
+                    Button("Save") {}
+                        .automationComponent(\ProfileScreen.saveButton)
+                }
+            }
+            .navigationTitle("Profile")
+            .toolbar {
+                ToolbarItem(placement: .cancellationAction) {
+                    Button("Close") {
+                        dismiss()
+                    }
+                    .automationComponent(\ProfileScreen.closeButton)
+                }
+            }
+        }
+        .automationScreen(ProfileScreen.self)
+    }
+}