a71104db05
App-side changes: - Added "Get Started" / "Continue" next buttons to all onboarding pages (Welcome, Day, Time, Style) with onboarding_next_button accessibility ID - Added onNext callback plumbing from OnboardingMain to each page - OnboardingMain now uses TabView(selection:) for programmatic page navigation - Added .accessibilityElement(children: .contain) to all onboarding pages to fix iOS 26 paged TabView not exposing child elements - Added settings_segmented_picker accessibility ID to Settings Picker - Reduced padding on onboarding pages to keep buttons in visible area Test-side changes: - OnboardingScreen: replaced unreliable swipeToNext() with tapNext() that taps the accessibility-identified next button - OnboardingScreen: multi-strategy skip button detection for subscription page - SettingsScreen: scoped segment tap to picker element to avoid tab bar collision - CustomizeScreen: simplified horizontal scroll to plain app.swipeLeft() - OnboardingVotingTests: uses tapNext() to advance to Day page Passing: OnboardingTests.CompleteFlow, OnboardingVotingTests Remaining: OnboardingTests.DoesNotRepeat (session state issue), Settings scroll (deep elements), Customize horizontal pickers Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
130 lines
4.5 KiB
Swift
130 lines
4.5 KiB
Swift
//
|
|
// OnboardingTime.swift
|
|
// Reflect (iOS)
|
|
//
|
|
// Created by Trey Tartt on 1/20/22.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct OnboardingTime: View {
|
|
@ObservedObject var onboardingData: OnboardingData
|
|
var onNext: (() -> Void)? = nil
|
|
|
|
var formatter: DateFormatter {
|
|
let dateFormatter = DateFormatter()
|
|
dateFormatter.timeStyle = .short
|
|
return dateFormatter
|
|
}
|
|
|
|
var body: some View {
|
|
ZStack {
|
|
// Gradient background
|
|
LinearGradient(
|
|
colors: [Color(hex: "f093fb"), Color(hex: "f5576c")],
|
|
startPoint: .topLeading,
|
|
endPoint: .bottomTrailing
|
|
)
|
|
.ignoresSafeArea()
|
|
|
|
VStack(spacing: 0) {
|
|
Spacer()
|
|
|
|
// Icon
|
|
ZStack {
|
|
Circle()
|
|
.fill(.white.opacity(0.15))
|
|
.frame(width: 120, height: 120)
|
|
|
|
Image(systemName: "bell.fill")
|
|
.font(.largeTitle)
|
|
.foregroundColor(.white)
|
|
}
|
|
.padding(.bottom, 32)
|
|
|
|
// Title
|
|
Text("When should we\nremind you?")
|
|
.font(.title.weight(.bold))
|
|
.foregroundColor(.white)
|
|
.multilineTextAlignment(.center)
|
|
.padding(.bottom, 12)
|
|
|
|
// Subtitle
|
|
Text("Pick a time that works for your daily check-in")
|
|
.font(.body.weight(.medium))
|
|
.foregroundColor(.white.opacity(0.85))
|
|
.multilineTextAlignment(.center)
|
|
.fixedSize(horizontal: false, vertical: true)
|
|
.padding(.horizontal, 40)
|
|
|
|
Spacer()
|
|
|
|
// Time picker card
|
|
VStack(spacing: 16) {
|
|
DatePicker("", selection: $onboardingData.date, displayedComponents: .hourAndMinute)
|
|
.datePickerStyle(.wheel)
|
|
.labelsHidden()
|
|
.colorScheme(.light)
|
|
.accessibilityLabel(String(localized: "Reminder time"))
|
|
.accessibilityHint(String(localized: "Select when you want to be reminded"))
|
|
}
|
|
.padding(.vertical, 20)
|
|
.padding(.horizontal, 24)
|
|
.background(
|
|
RoundedRectangle(cornerRadius: 24)
|
|
.fill(.white)
|
|
.shadow(color: .black.opacity(0.1), radius: 20, y: 10)
|
|
)
|
|
.padding(.horizontal, 30)
|
|
|
|
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")
|
|
.font(.title3)
|
|
.foregroundColor(.white.opacity(0.8))
|
|
.accessibilityHidden(true)
|
|
|
|
Text("You'll get a gentle reminder at \(formatter.string(from: onboardingData.date)) every day")
|
|
.font(.subheadline.weight(.medium))
|
|
.foregroundColor(.white.opacity(0.9))
|
|
.fixedSize(horizontal: false, vertical: true)
|
|
}
|
|
.padding(.horizontal, 30)
|
|
.padding(.bottom, 40)
|
|
.accessibilityElement(children: .combine)
|
|
}
|
|
}
|
|
.accessibilityElement(children: .contain)
|
|
.accessibilityIdentifier(AccessibilityID.Onboarding.timeScreen)
|
|
}
|
|
}
|
|
|
|
struct OnboardingTime_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
Group {
|
|
OnboardingTime(onboardingData: OnboardingData())
|
|
|
|
OnboardingTime(onboardingData: OnboardingData())
|
|
.preferredColorScheme(.dark)
|
|
}
|
|
}
|
|
}
|