diff --git a/Shared/AccessibilityIdentifiers.swift b/Shared/AccessibilityIdentifiers.swift index 7713ee3..1c1e69f 100644 --- a/Shared/AccessibilityIdentifiers.swift +++ b/Shared/AccessibilityIdentifiers.swift @@ -80,6 +80,7 @@ enum AccessibilityID { // MARK: - Settings enum Settings { static let header = "settings_header" + static let segmentedPicker = "settings_segmented_picker" static let customizeTab = "settings_tab_customize" static let settingsTab = "settings_tab_settings" static let upgradeBanner = "upgrade_banner" @@ -170,6 +171,7 @@ enum AccessibilityID { static let subscriptionScreen = "onboarding_subscription" static let subscribeButton = "onboarding_subscribe_button" static let skipButton = "onboarding_skip_button" + static let nextButton = "onboarding_next_button" } // MARK: - Reports diff --git a/Shared/Onboarding/views/OnboardingDay.swift b/Shared/Onboarding/views/OnboardingDay.swift index d1f0070..d8d4f49 100644 --- a/Shared/Onboarding/views/OnboardingDay.swift +++ b/Shared/Onboarding/views/OnboardingDay.swift @@ -23,6 +23,7 @@ enum DayOptions: Int, CaseIterable, RawRepresentable, Codable { struct OnboardingDay: View { @ObservedObject var onboardingData: OnboardingData + var onNext: (() -> Void)? = nil var body: some View { VStack(spacing: 0) { @@ -89,6 +90,22 @@ struct OnboardingDay: View { Spacer() + // Continue button + Button(action: { onNext?() }) { + Text("Continue") + .font(.headline.weight(.semibold)) + .foregroundColor(Color(hex: "4facfe")) + .frame(maxWidth: .infinity) + .padding(.vertical, 16) + .background( + RoundedRectangle(cornerRadius: 16) + .fill(.white) + ) + } + .padding(.horizontal, 30) + .padding(.bottom, 30) + .accessibilityIdentifier(AccessibilityID.Onboarding.nextButton) + // Tip HStack(spacing: 12) { Image(systemName: "lightbulb.fill") @@ -101,7 +118,7 @@ struct OnboardingDay: View { .fixedSize(horizontal: false, vertical: true) } .padding(.horizontal, 30) - .padding(.bottom, 80) + .padding(.bottom, 40) } .background( LinearGradient( @@ -111,6 +128,7 @@ struct OnboardingDay: View { ) .ignoresSafeArea() ) + .accessibilityElement(children: .contain) .accessibilityIdentifier(AccessibilityID.Onboarding.dayScreen) } diff --git a/Shared/Onboarding/views/OnboardingMain.swift b/Shared/Onboarding/views/OnboardingMain.swift index f29a0e7..24b2c5f 100644 --- a/Shared/Onboarding/views/OnboardingMain.swift +++ b/Shared/Onboarding/views/OnboardingMain.swift @@ -11,22 +11,27 @@ struct OnboardingMain: View { @Environment(\.presentationMode) var presentationMode @State var onboardingData: OnboardingData @EnvironmentObject var iapManager: IAPManager + @State private var currentPage: Int = 0 let updateBoardingDataClosure: ((OnboardingData) -> Void) var body: some View { - TabView { + TabView(selection: $currentPage) { // 1. Welcome screen - OnboardingWelcome() + OnboardingWelcome(onNext: nextPage) + .tag(0) // 2. Which day to rate - OnboardingDay(onboardingData: onboardingData) + OnboardingDay(onboardingData: onboardingData, onNext: nextPage) + .tag(1) // 3. Reminder time - OnboardingTime(onboardingData: onboardingData) + OnboardingTime(onboardingData: onboardingData, onNext: nextPage) + .tag(2) // 4. Style customization - OnboardingStyle(onboardingData: onboardingData) + OnboardingStyle(onboardingData: onboardingData, onNext: nextPage) + .tag(3) // 5. Subscription benefits & completion OnboardingSubscription( @@ -35,6 +40,7 @@ struct OnboardingMain: View { updateBoardingDataClosure(data) } ) + .tag(4) } .ignoresSafeArea() .tabViewStyle(.page) @@ -44,6 +50,12 @@ struct OnboardingMain: View { .interactiveDismissDisabled() } + private func nextPage() { + withAnimation { + currentPage += 1 + } + } + func setupAppearance() { UIPageControl.appearance().currentPageIndicatorTintColor = .white UIPageControl.appearance().pageIndicatorTintColor = UIColor.white.withAlphaComponent(0.3) diff --git a/Shared/Onboarding/views/OnboardingStyle.swift b/Shared/Onboarding/views/OnboardingStyle.swift index da67703..d2a6be8 100644 --- a/Shared/Onboarding/views/OnboardingStyle.swift +++ b/Shared/Onboarding/views/OnboardingStyle.swift @@ -9,6 +9,7 @@ import SwiftUI struct OnboardingStyle: View { @ObservedObject var onboardingData: OnboardingData + var onNext: (() -> Void)? = nil @State private var selectedTheme: AppTheme = .celestial var body: some View { @@ -65,6 +66,22 @@ struct OnboardingStyle: View { } .padding(.horizontal, 20) + // Continue button + Button(action: { onNext?() }) { + Text("Continue") + .font(.headline.weight(.semibold)) + .foregroundColor(.white) + .frame(maxWidth: .infinity) + .padding(.vertical, 16) + .background( + RoundedRectangle(cornerRadius: 16) + .fill(.white.opacity(0.25)) + ) + } + .padding(.horizontal, 20) + .padding(.top, 24) + .accessibilityIdentifier(AccessibilityID.Onboarding.nextButton) + // Hint HStack(spacing: 8) { Image(systemName: "arrow.left.arrow.right") @@ -74,8 +91,8 @@ struct OnboardingStyle: View { .fixedSize(horizontal: false, vertical: true) } .foregroundColor(.white.opacity(0.7)) - .padding(.top, 24) - .padding(.bottom, 80) + .padding(.top, 12) + .padding(.bottom, 40) } } .background( @@ -91,6 +108,7 @@ struct OnboardingStyle: View { // Apply default theme on appear selectedTheme.apply() } + .accessibilityElement(children: .contain) .accessibilityIdentifier(AccessibilityID.Onboarding.styleScreen) } } diff --git a/Shared/Onboarding/views/OnboardingSubscription.swift b/Shared/Onboarding/views/OnboardingSubscription.swift index 6627b8e..ed1d7bb 100644 --- a/Shared/Onboarding/views/OnboardingSubscription.swift +++ b/Shared/Onboarding/views/OnboardingSubscription.swift @@ -127,7 +127,7 @@ struct OnboardingSubscription: View { .padding(.top, 4) } .padding(.horizontal, 24) - .padding(.bottom, 50) + .padding(.bottom, 30) } .background( LinearGradient( @@ -137,6 +137,7 @@ struct OnboardingSubscription: View { ) .ignoresSafeArea() ) + .accessibilityElement(children: .contain) .accessibilityIdentifier(AccessibilityID.Onboarding.subscriptionScreen) .sheet(isPresented: $showSubscriptionStore, onDismiss: { // After subscription store closes, complete onboarding diff --git a/Shared/Onboarding/views/OnboardingTime.swift b/Shared/Onboarding/views/OnboardingTime.swift index b475652..e0ed072 100644 --- a/Shared/Onboarding/views/OnboardingTime.swift +++ b/Shared/Onboarding/views/OnboardingTime.swift @@ -9,6 +9,7 @@ import SwiftUI struct OnboardingTime: View { @ObservedObject var onboardingData: OnboardingData + var onNext: (() -> Void)? = nil var formatter: DateFormatter { let dateFormatter = DateFormatter() @@ -78,6 +79,22 @@ struct OnboardingTime: View { Spacer() + // Continue button + Button(action: { onNext?() }) { + Text("Continue") + .font(.headline.weight(.semibold)) + .foregroundColor(Color(hex: "f5576c")) + .frame(maxWidth: .infinity) + .padding(.vertical, 16) + .background( + RoundedRectangle(cornerRadius: 16) + .fill(.white) + ) + } + .padding(.horizontal, 30) + .padding(.bottom, 16) + .accessibilityIdentifier(AccessibilityID.Onboarding.nextButton) + // Info text HStack(spacing: 12) { Image(systemName: "info.circle.fill") @@ -91,10 +108,11 @@ struct OnboardingTime: View { .fixedSize(horizontal: false, vertical: true) } .padding(.horizontal, 30) - .padding(.bottom, 80) + .padding(.bottom, 40) .accessibilityElement(children: .combine) } } + .accessibilityElement(children: .contain) .accessibilityIdentifier(AccessibilityID.Onboarding.timeScreen) } } diff --git a/Shared/Onboarding/views/OnboardingWelcome.swift b/Shared/Onboarding/views/OnboardingWelcome.swift index bca0f24..0a1161b 100644 --- a/Shared/Onboarding/views/OnboardingWelcome.swift +++ b/Shared/Onboarding/views/OnboardingWelcome.swift @@ -8,6 +8,8 @@ import SwiftUI struct OnboardingWelcome: View { + var onNext: (() -> Void)? = nil + var body: some View { ZStack { // Gradient background @@ -54,28 +56,32 @@ struct OnboardingWelcome: View { Spacer() // Feature highlights - VStack(spacing: 20) { + VStack(spacing: 16) { FeatureRow(icon: "bell.badge.fill", title: "Daily Reminders", description: "Never forget to log your mood") FeatureRow(icon: "chart.bar.fill", title: "Beautiful Insights", description: "See your mood patterns over time") FeatureRow(icon: "paintpalette.fill", title: "Fully Customizable", description: "Make it yours with themes & colors") } .padding(.horizontal, 30) - .padding(.bottom, 40) + .padding(.bottom, 24) - // Swipe hint - HStack(spacing: 8) { - Text("Swipe to get started") - .font(.subheadline.weight(.medium)) - .foregroundColor(.white.opacity(0.7)) - Image(systemName: "chevron.right") - .font(.subheadline.weight(.semibold)) - .foregroundColor(.white.opacity(0.7)) + // Continue button + Button(action: { onNext?() }) { + Text("Get Started") + .font(.headline.weight(.semibold)) + .foregroundColor(Color(hex: "667eea")) + .frame(maxWidth: .infinity) + .padding(.vertical, 14) + .background( + RoundedRectangle(cornerRadius: 16) + .fill(.white) + ) } - .padding(.bottom, 60) - .accessibilityLabel(String(localized: "Swipe right to continue")) - .accessibilityHint(String(localized: "Swipe to the next onboarding step")) + .padding(.horizontal, 30) + .padding(.bottom, 40) + .accessibilityIdentifier(AccessibilityID.Onboarding.nextButton) } } + .accessibilityElement(children: .contain) .accessibilityIdentifier(AccessibilityID.Onboarding.welcomeScreen) } } diff --git a/Shared/Views/SettingsView/SettingsTabView.swift b/Shared/Views/SettingsView/SettingsTabView.swift index a0061a5..1f339a8 100644 --- a/Shared/Views/SettingsView/SettingsTabView.swift +++ b/Shared/Views/SettingsView/SettingsTabView.swift @@ -56,6 +56,7 @@ struct SettingsTabView: View { } } .pickerStyle(.segmented) + .accessibilityIdentifier(AccessibilityID.Settings.segmentedPicker) .padding(.horizontal, 16) .padding(.top, 12) .padding(.bottom, 16) diff --git a/Tests iOS/Helpers/WaitHelpers.swift b/Tests iOS/Helpers/WaitHelpers.swift index 4c97f9a..288e62f 100644 --- a/Tests iOS/Helpers/WaitHelpers.swift +++ b/Tests iOS/Helpers/WaitHelpers.swift @@ -28,6 +28,7 @@ enum UITestID { enum Settings { static let header = "settings_header" + static let segmentedPicker = "settings_segmented_picker" static let customizeTab = "settings_tab_customize" static let settingsTab = "settings_tab_settings" static let upgradeBanner = "upgrade_banner" @@ -76,6 +77,7 @@ enum UITestID { static let subscription = "onboarding_subscription" static let subscribe = "onboarding_subscribe_button" static let skip = "onboarding_skip_button" + static let next = "onboarding_next_button" } enum Paywall { diff --git a/Tests iOS/OnboardingVotingTests.swift b/Tests iOS/OnboardingVotingTests.swift index a35220d..c00e11f 100644 --- a/Tests iOS/OnboardingVotingTests.swift +++ b/Tests iOS/OnboardingVotingTests.swift @@ -16,8 +16,8 @@ final class OnboardingVotingTests: BaseUITestCase { let onboarding = OnboardingScreen(app: app) onboarding.assertVisible() - // Swipe from Welcome to the Day page - onboarding.swipeToNext() + // Advance from Welcome to Day page + onboarding.tapNext() // Tap Yesterday via accessibility ID let yesterdayButton = app.element(UITestID.Onboarding.dayYesterday) diff --git a/Tests iOS/Screens/CustomizeScreen.swift b/Tests iOS/Screens/CustomizeScreen.swift index 11e672f..52158dc9 100644 --- a/Tests iOS/Screens/CustomizeScreen.swift +++ b/Tests iOS/Screens/CustomizeScreen.swift @@ -42,7 +42,7 @@ struct CustomizeScreen { // MARK: - Actions /// Select a button in a horizontal picker. Scrolls vertically to reveal - /// the section, then scrolls horizontally within the picker to find the button. + /// the section, then scrolls horizontally to find the button. private func selectHorizontalPickerButton( _ button: XCUIElement, file: StaticString = #filePath, @@ -55,31 +55,23 @@ struct CustomizeScreen { } // Phase 1: Scroll settings page vertically to reveal the section - let mainScroll = app.scrollViews.firstMatch for _ in 0..<5 { if button.exists && button.isHittable { button.forceTap(file: file, line: line) return } - mainScroll.swipeUp() + app.swipeUp() } - // Phase 2: Button is in hierarchy but off-screen in horizontal scroll. - // Find the horizontal scroll view containing the button and swipe within it. + // Phase 2: Button exists in tree but is off-screen in a horizontal ScrollView. + // Simple left swipes on the app to scroll horizontally. if button.exists { - // Swipe left on the button's parent region to scroll the horizontal picker for _ in 0..<8 { if button.isHittable { button.forceTap(file: file, line: line) return } - // Swipe left at the button's Y position to scroll the horizontal picker - let buttonFrame = button.frame - let startPoint = app.coordinate(withNormalizedOffset: CGVector(dx: 0.8, dy: 0)) - .withOffset(CGVector(dx: 0, dy: buttonFrame.midY)) - let endPoint = app.coordinate(withNormalizedOffset: CGVector(dx: 0.2, dy: 0)) - .withOffset(CGVector(dx: 0, dy: buttonFrame.midY)) - startPoint.press(forDuration: 0.05, thenDragTo: endPoint) + app.swipeLeft() } } @@ -89,7 +81,7 @@ struct CustomizeScreen { button.forceTap(file: file, line: line) return } - mainScroll.swipeRight() + app.swipeRight() } XCTFail("Could not find or tap button: \(button)", file: file, line: line) diff --git a/Tests iOS/Screens/OnboardingScreen.swift b/Tests iOS/Screens/OnboardingScreen.swift index 1cbe184..3089bfd 100644 --- a/Tests iOS/Screens/OnboardingScreen.swift +++ b/Tests iOS/Screens/OnboardingScreen.swift @@ -16,59 +16,76 @@ struct OnboardingScreen { // MARK: - Elements var welcomeScreen: XCUIElement { app.element(UITestID.Onboarding.welcome) } - var subscriptionScreen: XCUIElement { app.element(UITestID.Onboarding.subscription) } var dayTodayButton: XCUIElement { app.element(UITestID.Onboarding.dayToday) } var dayYesterdayButton: XCUIElement { app.element(UITestID.Onboarding.dayYesterday) } var skipButton: XCUIElement { app.element(UITestID.Onboarding.skip) } + var nextButton: XCUIElement { app.element(UITestID.Onboarding.next) } // MARK: - Actions - /// Swipe to next onboarding page. Uses a coordinate-based drag at the top - /// of the screen to avoid DatePicker/ScrollView gesture conflicts on inner pages. - /// This is the only reliable way to advance a paged TabView in XCUITest. - func swipeToNext() { - // Use slow velocity for reliable paged TabView advancement on iOS 26. - app.swipeLeft(velocity: .slow) - // Allow transition animation to settle - _ = app.waitForExistence(timeout: 0.8) + /// Tap the "Continue" / "Get Started" next button to advance one page. + func tapNext(file: StaticString = #filePath, line: UInt = #line) { + nextButton.waitForExistenceOrFail( + timeout: navigationTimeout, + message: "Onboarding next button should exist", + file: file, line: line + ) + // Tap via coordinate — the page indicator may overlap the button's hittable area + nextButton.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5)).tap() + // Allow page transition to settle + _ = app.waitForExistence(timeout: 0.5) } - /// Complete the full onboarding flow: swipe through all screens and skip subscription. + /// Complete the full onboarding flow by tapping through all screens. func completeOnboarding(file: StaticString = #filePath, line: UInt = #line) { - // Welcome -> swipe + // Welcome -> tap next welcomeScreen.waitForExistenceOrFail( timeout: navigationTimeout, message: "Onboarding welcome screen should appear", file: file, line: line ) - swipeToNext() + tapNext(file: file, line: line) - // Time -> swipe. The wheel DatePicker can absorb gestures, so retry if needed. - swipeToNext() - if !dayTodayButton.waitForExistence(timeout: 2) { - // Retry — the DatePicker may have absorbed the first swipe - swipeToNext() - } - - // Day -> select Today, then swipe + // Day -> select Today, tap next dayTodayButton.waitForExistenceOrFail( timeout: navigationTimeout, message: "Day 'Today' button should appear", file: file, line: line ) dayTodayButton.forceTap(file: file, line: line) - swipeToNext() + tapNext(file: file, line: line) - // Style -> swipe - swipeToNext() + // Time -> tap next + tapNext(file: file, line: line) - // Subscription -> tap skip - skipButton.waitForExistenceOrFail( - timeout: navigationTimeout, - message: "Skip button should appear on subscription screen", - file: file, line: line - ) - skipButton.forceTap(file: file, line: line) + // Style -> tap next + tapNext(file: file, line: line) + + // Subscription -> tap skip ("Maybe Later") + // The subscription page may not expose children via accessibility IDs on iOS 26. + // Try multiple strategies. + let strategies: [() -> Bool] = [ + { self.skipButton.waitForExistence(timeout: 2) }, + { self.app.buttons["Maybe Later"].waitForExistence(timeout: 2) }, + { self.app.staticTexts["Maybe Later"].waitForExistence(timeout: 2) }, + ] + + for strategy in strategies { + if strategy() { + break + } + } + + if skipButton.exists { + skipButton.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5)).tap() + } else if app.buttons["Maybe Later"].exists { + app.buttons["Maybe Later"].tap() + } else if app.staticTexts["Maybe Later"].exists { + app.staticTexts["Maybe Later"].tap() + } else { + // Last resort: tap at the expected button location (below center) + app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.88)).tap() + } } // MARK: - Assertions diff --git a/Tests iOS/Screens/SettingsScreen.swift b/Tests iOS/Screens/SettingsScreen.swift index a800779..1f17a4a 100644 --- a/Tests iOS/Screens/SettingsScreen.swift +++ b/Tests iOS/Screens/SettingsScreen.swift @@ -16,8 +16,7 @@ struct SettingsScreen { // MARK: - Elements var settingsHeader: XCUIElement { app.element(UITestID.Settings.header) } - var customizeSegment: XCUIElement { app.element(UITestID.Settings.customizeTab) } - var settingsSegment: XCUIElement { app.element(UITestID.Settings.settingsTab) } + var segmentedPicker: XCUIElement { app.element(UITestID.Settings.segmentedPicker) } var upgradeBanner: XCUIElement { app.element(UITestID.Settings.upgradeBanner) } var subscribeButton: XCUIElement { app.element(UITestID.Settings.subscribeButton) } var whyUpgradeButton: XCUIElement { app.element(UITestID.Settings.whyUpgradeButton) } @@ -30,42 +29,34 @@ struct SettingsScreen { // MARK: - Actions func tapCustomizeTab(file: StaticString = #filePath, line: UInt = #line) { - tapSegment(identifier: UITestID.Settings.customizeTab, fallbackLabel: "Customize", file: file, line: line) + tapSegment(label: "Customize", file: file, line: line) } func tapSettingsTab(file: StaticString = #filePath, line: UInt = #line) { - tapSegment(identifier: UITestID.Settings.settingsTab, fallbackLabel: "Settings", file: file, line: line) + tapSegment(label: "Settings", file: file, line: line) } - private func tapSegment(identifier: String, fallbackLabel: String, file: StaticString, line: UInt) { - // On iOS 26, segmented controls may expose buttons by label or by ID. - // Try multiple strategies in order of reliability. - - // Strategy 1: Segmented control button by label (most reliable) - let segButton = app.segmentedControls.buttons[fallbackLabel] - if segButton.waitForExistence(timeout: defaultTimeout) && segButton.isHittable { - segButton.tap() - return - } - - // Strategy 2: Find a non-tab-bar button with matching label - let tabBarButton = app.tabBars.buttons[fallbackLabel] - let allButtons = app.buttons.matching(NSPredicate(format: "label == %@", fallbackLabel)).allElementsBoundByIndex - for button in allButtons { - if button.isHittable && button.frame != tabBarButton.frame { + /// Tap a segmented control button by label, scoped to the settings picker + /// to avoid collision with the tab bar's "Settings" button. + private func tapSegment(label: String, file: StaticString, line: UInt) { + // Find the segmented picker by its accessibility ID, then find the button within it + let picker = segmentedPicker + if picker.waitForExistence(timeout: defaultTimeout) { + let button = picker.buttons[label] + if button.waitForExistence(timeout: defaultTimeout) && button.isHittable { button.tap() return } } - // Strategy 3: Accessibility ID with coordinate tap fallback - let byID = app.element(identifier) - if byID.waitForExistence(timeout: defaultTimeout) { - byID.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5)).tap() + // Fallback: segmented control element type + let segButton = app.segmentedControls.buttons[label] + if segButton.waitForExistence(timeout: defaultTimeout) && segButton.isHittable { + segButton.tap() return } - XCTFail("Could not find segment '\(fallbackLabel)' by ID or label", file: file, line: line) + XCTFail("Could not find segment '\(label)' in settings picker", file: file, line: line) } func tapClearData(file: StaticString = #filePath, line: UInt = #line) { @@ -79,8 +70,7 @@ struct SettingsScreen { } /// Scroll within the settings content to find a deeply nested element. - /// Uses aggressive swipes on the main app surface since the ScrollView - /// hierarchy varies by iOS version. + /// Swipes in the center band of the screen (between header and tab bar). private func scrollToSettingsElement( _ element: XCUIElement, maxSwipes: Int, @@ -90,9 +80,9 @@ struct SettingsScreen { if element.exists && element.isHittable { return } for _ in 0..