polish iOS study flow
This commit is contained in:
@@ -30,18 +30,41 @@
|
|||||||
| `feed.next_round_body` | Next round body |
|
| `feed.next_round_body` | Next round body |
|
||||||
| `feed.watch_preview` | Watch preview CTA |
|
| `feed.watch_preview` | Watch preview CTA |
|
||||||
| `feed.round_ready` | Round ready label |
|
| `feed.round_ready` | Round ready label |
|
||||||
|
| `feed.title` | Feed title |
|
||||||
|
| `feed.subtitle` | Feed subtitle |
|
||||||
|
| `feed.hero_title` | Feed hero title |
|
||||||
|
| `feed.hero_subtitle` | Feed hero subtitle |
|
||||||
|
| `feed.lock_label` | Feed lock label |
|
||||||
|
| `feed.odds_label` | Feed odds label |
|
||||||
|
| `feed.cta` | Feed CTA |
|
||||||
| `round.countdown_label` | Countdown label |
|
| `round.countdown_label` | Countdown label |
|
||||||
| `round.locked_label` | Locked label |
|
| `round.locked_label` | Locked label |
|
||||||
| `round.selection_prompt` | Selection prompt |
|
| `round.selection_prompt` | Selection prompt |
|
||||||
| `round.selection_confirmed` | Selection accepted |
|
| `round.selection_confirmed` | Selection accepted |
|
||||||
| `round.selection_submitting` | Selection submitting |
|
| `round.selection_submitting` | Selection submitting |
|
||||||
| `round.odds_label` | Odds label |
|
| `round.odds_label` | Odds label |
|
||||||
|
| `round.title` | Round title |
|
||||||
|
| `round.subtitle` | Round subtitle |
|
||||||
|
| `round.video_placeholder` | Video placeholder |
|
||||||
|
| `round.preview_label` | Preview label |
|
||||||
|
| `round.primary_cta` | Round confirm CTA |
|
||||||
|
| `round.home` | Home outcome label |
|
||||||
|
| `round.away` | Away outcome label |
|
||||||
| `reveal.title` | Reveal title |
|
| `reveal.title` | Reveal title |
|
||||||
| `reveal.subtitle` | Reveal subtitle |
|
| `reveal.subtitle` | Reveal subtitle |
|
||||||
|
| `reveal.status` | Reveal status |
|
||||||
|
| `reveal.cta` | Reveal CTA |
|
||||||
| `result.title` | Result title |
|
| `result.title` | Result title |
|
||||||
| `result.user_selection` | User selection label |
|
| `result.selection_label` | Result selection label |
|
||||||
| `result.outcome` | Outcome label |
|
| `result.outcome_label` | Result outcome label |
|
||||||
|
| `result.win` | Winning result label |
|
||||||
|
| `result.lose` | Losing result label |
|
||||||
| `result.next_round` | Next round CTA |
|
| `result.next_round` | Next round CTA |
|
||||||
|
| `result.subtitle` | Result subtitle |
|
||||||
|
| `result.selection_label` | Result selection label |
|
||||||
|
| `result.outcome_label` | Result outcome label |
|
||||||
|
| `result.win` | Winning result label |
|
||||||
|
| `result.lose` | Losing result label |
|
||||||
| `settings.title` | Settings title |
|
| `settings.title` | Settings title |
|
||||||
| `settings.language` | Language setting |
|
| `settings.language` | Language setting |
|
||||||
| `settings.haptics` | Haptics setting |
|
| `settings.haptics` | Haptics setting |
|
||||||
|
|||||||
@@ -2,11 +2,14 @@ import SwiftUI
|
|||||||
|
|
||||||
@main
|
@main
|
||||||
struct HermesApp: App {
|
struct HermesApp: App {
|
||||||
|
@StateObject private var analytics = HermesAnalyticsClient()
|
||||||
|
|
||||||
var body: some Scene {
|
var body: some Scene {
|
||||||
WindowGroup {
|
WindowGroup {
|
||||||
RootView()
|
RootView()
|
||||||
.preferredColorScheme(.dark)
|
.preferredColorScheme(.dark)
|
||||||
.tint(HermesTheme.accent)
|
.tint(HermesTheme.accent)
|
||||||
|
.environmentObject(analytics)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import SwiftUI
|
|||||||
|
|
||||||
struct RootView: View {
|
struct RootView: View {
|
||||||
@StateObject private var localization = LocalizationStore()
|
@StateObject private var localization = LocalizationStore()
|
||||||
|
@EnvironmentObject private var analytics: HermesAnalyticsClient
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
NavigationStack {
|
NavigationStack {
|
||||||
@@ -20,6 +21,10 @@ struct RootView: View {
|
|||||||
.navigationBarTitleDisplayMode(.inline)
|
.navigationBarTitleDisplayMode(.inline)
|
||||||
}
|
}
|
||||||
.environmentObject(localization)
|
.environmentObject(localization)
|
||||||
|
.onAppear {
|
||||||
|
analytics.track("app_opened", attributes: ["screen_name": "home"])
|
||||||
|
analytics.track("screen_viewed", attributes: ["screen_name": "home"])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private var header: some View {
|
private var header: some View {
|
||||||
@@ -51,6 +56,7 @@ struct RootView: View {
|
|||||||
|
|
||||||
return Button {
|
return Button {
|
||||||
localization.setLocale(localeCode)
|
localization.setLocale(localeCode)
|
||||||
|
analytics.track("locale_changed", attributes: ["locale_code": localeCode])
|
||||||
} label: {
|
} label: {
|
||||||
Text(title)
|
Text(title)
|
||||||
.font(.caption.weight(.bold))
|
.font(.caption.weight(.bold))
|
||||||
|
|||||||
@@ -1,13 +1,28 @@
|
|||||||
|
import Combine
|
||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
protocol AnalyticsTracking {
|
protocol AnalyticsTracking {
|
||||||
func track(_ event: String, attributes: [String: String])
|
func track(_ event: String, attributes: [String: String])
|
||||||
}
|
}
|
||||||
|
|
||||||
final class HermesAnalyticsClient: AnalyticsTracking {
|
struct HermesTrackedEvent: Identifiable, Equatable {
|
||||||
|
let id = UUID()
|
||||||
|
let event: String
|
||||||
|
let attributes: [String: String]
|
||||||
|
let timestamp: Date
|
||||||
|
}
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
final class HermesAnalyticsClient: ObservableObject, AnalyticsTracking {
|
||||||
|
@Published private(set) var trackedEvents: [HermesTrackedEvent] = []
|
||||||
|
|
||||||
func track(_ event: String, attributes: [String: String]) {
|
func track(_ event: String, attributes: [String: String]) {
|
||||||
// Scaffold implementation.
|
trackedEvents.append(
|
||||||
_ = event
|
HermesTrackedEvent(
|
||||||
_ = attributes
|
event: event,
|
||||||
|
attributes: attributes,
|
||||||
|
timestamp: Date()
|
||||||
|
)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,6 +115,7 @@ struct HermesMetricPill: View {
|
|||||||
struct HermesCountdownBadge: View {
|
struct HermesCountdownBadge: View {
|
||||||
let label: String
|
let label: String
|
||||||
let value: String
|
let value: String
|
||||||
|
var warning: Bool = false
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack(alignment: .leading, spacing: 4) {
|
VStack(alignment: .leading, spacing: 4) {
|
||||||
@@ -123,11 +124,11 @@ struct HermesCountdownBadge: View {
|
|||||||
.foregroundStyle(HermesTheme.textTertiary)
|
.foregroundStyle(HermesTheme.textTertiary)
|
||||||
Text(value)
|
Text(value)
|
||||||
.font(.title3.weight(.bold))
|
.font(.title3.weight(.bold))
|
||||||
.foregroundStyle(HermesTheme.accent)
|
.foregroundStyle(warning ? HermesTheme.warning : HermesTheme.accent)
|
||||||
}
|
}
|
||||||
.padding(.horizontal, 14)
|
.padding(.horizontal, 14)
|
||||||
.padding(.vertical, 12)
|
.padding(.vertical, 12)
|
||||||
.background(HermesTheme.accentSoft)
|
.background((warning ? HermesTheme.warning : HermesTheme.accent).opacity(0.16))
|
||||||
.clipShape(RoundedRectangle(cornerRadius: HermesTheme.insetRadius, style: .continuous))
|
.clipShape(RoundedRectangle(cornerRadius: HermesTheme.insetRadius, style: .continuous))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,37 @@
|
|||||||
|
import AVFoundation
|
||||||
import Combine
|
import Combine
|
||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
|
@MainActor
|
||||||
final class PlayerCoordinator: ObservableObject {
|
final class PlayerCoordinator: ObservableObject {
|
||||||
|
let player: AVPlayer
|
||||||
|
|
||||||
@Published var isPlaying = false
|
@Published var isPlaying = false
|
||||||
@Published var playbackPositionMs: Int = 0
|
@Published var playbackPositionMs: Int = 0
|
||||||
|
|
||||||
|
init(previewURL: URL = URL(string: "https://cdn.example.com/hermes/sample-event/master.m3u8")!) {
|
||||||
|
self.player = AVPlayer(url: previewURL)
|
||||||
|
self.player.actionAtItemEnd = .pause
|
||||||
|
}
|
||||||
|
|
||||||
|
func prepareForPreview() {
|
||||||
|
player.seek(to: .zero)
|
||||||
|
player.play()
|
||||||
|
isPlaying = true
|
||||||
|
}
|
||||||
|
|
||||||
|
func play() {
|
||||||
|
player.play()
|
||||||
|
isPlaying = true
|
||||||
|
}
|
||||||
|
|
||||||
|
func pause() {
|
||||||
|
player.pause()
|
||||||
|
isPlaying = false
|
||||||
|
}
|
||||||
|
|
||||||
|
func restart() {
|
||||||
|
player.seek(to: .zero)
|
||||||
|
play()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
import AVKit
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
struct StudyVideoPlayerView: View {
|
||||||
|
@ObservedObject var coordinator: PlayerCoordinator
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
VideoPlayer(player: coordinator.player)
|
||||||
|
.frame(maxWidth: .infinity)
|
||||||
|
.frame(height: 224)
|
||||||
|
.clipShape(RoundedRectangle(cornerRadius: HermesTheme.cornerRadius, style: .continuous))
|
||||||
|
.overlay(
|
||||||
|
RoundedRectangle(cornerRadius: HermesTheme.cornerRadius, style: .continuous)
|
||||||
|
.stroke(HermesTheme.accent.opacity(0.12), lineWidth: 1)
|
||||||
|
)
|
||||||
|
.background(HermesTheme.surfaceElevated)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -42,8 +42,8 @@ struct HermesEventMedia: Codable {
|
|||||||
var id: UUID
|
var id: UUID
|
||||||
var eventId: UUID
|
var eventId: UUID
|
||||||
var mediaType: String
|
var mediaType: String
|
||||||
var hlsMasterURL: URL
|
var hlsMasterUrl: URL
|
||||||
var posterURL: URL?
|
var posterUrl: URL?
|
||||||
var durationMs: Int
|
var durationMs: Int
|
||||||
var previewStartMs: Int
|
var previewStartMs: Int
|
||||||
var previewEndMs: Int
|
var previewEndMs: Int
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import SwiftUI
|
|||||||
|
|
||||||
struct FeedView: View {
|
struct FeedView: View {
|
||||||
@EnvironmentObject private var localization: LocalizationStore
|
@EnvironmentObject private var localization: LocalizationStore
|
||||||
|
@EnvironmentObject private var analytics: HermesAnalyticsClient
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack(alignment: .leading, spacing: HermesTheme.sectionSpacing) {
|
VStack(alignment: .leading, spacing: HermesTheme.sectionSpacing) {
|
||||||
@@ -40,11 +41,17 @@ struct FeedView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
|
analytics.track("next_round_requested", attributes: ["screen_name": "feed"])
|
||||||
|
analytics.track("cta_pressed", attributes: ["screen_name": "feed", "action": "watch_preview"])
|
||||||
} label: {
|
} label: {
|
||||||
Text(localization.string(for: "feed.cta"))
|
Text(localization.string(for: "feed.cta"))
|
||||||
}
|
}
|
||||||
.buttonStyle(HermesPrimaryButtonStyle())
|
.buttonStyle(HermesPrimaryButtonStyle())
|
||||||
}
|
}
|
||||||
.hermesCard(elevated: true)
|
.hermesCard(elevated: true)
|
||||||
|
.onAppear {
|
||||||
|
analytics.track("feed_viewed", attributes: ["screen_name": "feed"])
|
||||||
|
analytics.track("screen_viewed", attributes: ["screen_name": "feed"])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import SwiftUI
|
|||||||
|
|
||||||
struct OnboardingView: View {
|
struct OnboardingView: View {
|
||||||
@EnvironmentObject private var localization: LocalizationStore
|
@EnvironmentObject private var localization: LocalizationStore
|
||||||
|
@EnvironmentObject private var analytics: HermesAnalyticsClient
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack(alignment: .leading, spacing: HermesTheme.sectionSpacing) {
|
VStack(alignment: .leading, spacing: HermesTheme.sectionSpacing) {
|
||||||
@@ -24,11 +25,17 @@ struct OnboardingView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
|
analytics.track("consent_accepted", attributes: ["screen_name": "onboarding"])
|
||||||
|
analytics.track("cta_pressed", attributes: ["screen_name": "onboarding", "action": "start_session"])
|
||||||
} label: {
|
} label: {
|
||||||
Text(localization.string(for: "onboarding.start_session"))
|
Text(localization.string(for: "onboarding.start_session"))
|
||||||
}
|
}
|
||||||
.buttonStyle(HermesPrimaryButtonStyle())
|
.buttonStyle(HermesPrimaryButtonStyle())
|
||||||
}
|
}
|
||||||
.hermesCard(elevated: true)
|
.hermesCard(elevated: true)
|
||||||
|
.onAppear {
|
||||||
|
analytics.track("screen_viewed", attributes: ["screen_name": "onboarding"])
|
||||||
|
analytics.track("consent_viewed", attributes: ["screen_name": "onboarding"])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,48 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct ResultView: View {
|
struct ResultView: View {
|
||||||
|
let title: String
|
||||||
|
let subtitle: String
|
||||||
|
let selectionLabel: String
|
||||||
|
let selectionValue: String
|
||||||
|
let outcomeLabel: String
|
||||||
|
let outcomeValue: String
|
||||||
|
let didWin: Bool
|
||||||
|
let winLabel: String
|
||||||
|
let loseLabel: String
|
||||||
|
let nextRoundTitle: String
|
||||||
|
let onNextRound: () -> Void
|
||||||
|
|
||||||
|
@EnvironmentObject private var analytics: HermesAnalyticsClient
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Text("Result scaffold")
|
VStack(alignment: .leading, spacing: HermesTheme.sectionSpacing) {
|
||||||
|
HermesSectionHeader(title: title, subtitle: subtitle)
|
||||||
|
|
||||||
|
HStack(spacing: 12) {
|
||||||
|
HermesMetricPill(label: selectionLabel, value: selectionValue)
|
||||||
|
HermesMetricPill(label: outcomeLabel, value: outcomeValue)
|
||||||
|
}
|
||||||
|
|
||||||
|
HStack(spacing: 10) {
|
||||||
|
Image(systemName: didWin ? "checkmark.seal.fill" : "xmark.seal.fill")
|
||||||
|
.foregroundStyle(didWin ? HermesTheme.positive : HermesTheme.warning)
|
||||||
|
Text(didWin ? winLabel : loseLabel)
|
||||||
|
.font(.headline.weight(.semibold))
|
||||||
|
.foregroundStyle(HermesTheme.textPrimary)
|
||||||
|
}
|
||||||
|
|
||||||
|
Button {
|
||||||
|
analytics.track("next_round_requested", attributes: ["screen_name": "result"])
|
||||||
|
onNextRound()
|
||||||
|
} label: {
|
||||||
|
Text(nextRoundTitle)
|
||||||
|
}
|
||||||
|
.buttonStyle(HermesPrimaryButtonStyle())
|
||||||
|
}
|
||||||
|
.onAppear {
|
||||||
|
analytics.track("screen_viewed", attributes: ["screen_name": "result"])
|
||||||
|
analytics.track("result_viewed", attributes: ["screen_name": "result", "selection": selectionValue, "outcome": outcomeValue])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,39 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct RevealView: View {
|
struct RevealView: View {
|
||||||
|
let title: String
|
||||||
|
let subtitle: String
|
||||||
|
let statusText: String
|
||||||
|
let selectionLabel: String
|
||||||
|
let selectionValue: String
|
||||||
|
let continueTitle: String
|
||||||
|
let onContinue: () -> Void
|
||||||
|
|
||||||
|
@EnvironmentObject private var analytics: HermesAnalyticsClient
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Text("Reveal scaffold")
|
VStack(alignment: .leading, spacing: HermesTheme.sectionSpacing) {
|
||||||
|
HermesSectionHeader(title: title, subtitle: subtitle)
|
||||||
|
|
||||||
|
VStack(alignment: .leading, spacing: 12) {
|
||||||
|
HermesMetricPill(label: selectionLabel, value: selectionValue)
|
||||||
|
|
||||||
|
Text(statusText)
|
||||||
|
.font(.callout)
|
||||||
|
.foregroundStyle(HermesTheme.textSecondary)
|
||||||
|
}
|
||||||
|
|
||||||
|
Button {
|
||||||
|
analytics.track("reveal_completed", attributes: ["screen_name": "reveal", "selection": selectionValue])
|
||||||
|
onContinue()
|
||||||
|
} label: {
|
||||||
|
Text(continueTitle)
|
||||||
|
}
|
||||||
|
.buttonStyle(HermesPrimaryButtonStyle())
|
||||||
|
}
|
||||||
|
.onAppear {
|
||||||
|
analytics.track("screen_viewed", attributes: ["screen_name": "reveal"])
|
||||||
|
analytics.track("reveal_started", attributes: ["screen_name": "reveal", "selection": selectionValue])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,104 +2,228 @@ import SwiftUI
|
|||||||
|
|
||||||
struct RoundView: View {
|
struct RoundView: View {
|
||||||
@EnvironmentObject private var localization: LocalizationStore
|
@EnvironmentObject private var localization: LocalizationStore
|
||||||
@State private var selectedOutcomeID = "home"
|
@EnvironmentObject private var analytics: HermesAnalyticsClient
|
||||||
|
|
||||||
private struct OutcomeOption: Identifiable {
|
@StateObject private var playerCoordinator = PlayerCoordinator()
|
||||||
let id: String
|
@State private var phase: Phase = .preview
|
||||||
let label: String
|
@State private var selectedOutcomeID: String? = nil
|
||||||
let odds: String
|
@State private var lockAt: Date = Date().addingTimeInterval(47)
|
||||||
|
@State private var transitionTask: Task<Void, Never>?
|
||||||
|
|
||||||
|
private let previewDuration: TimeInterval = 47
|
||||||
|
private let winningOutcomeID = "home"
|
||||||
|
|
||||||
|
private enum Phase {
|
||||||
|
case preview
|
||||||
|
case locked
|
||||||
|
case reveal
|
||||||
|
case result
|
||||||
}
|
}
|
||||||
|
|
||||||
private var outcomeOptions: [OutcomeOption] {
|
private var selectionOptions: [SelectionOption] {
|
||||||
[
|
[
|
||||||
OutcomeOption(id: "home", label: localization.string(for: "round.home"), odds: "1.85"),
|
SelectionOption(
|
||||||
OutcomeOption(id: "away", label: localization.string(for: "round.away"), odds: "2.05"),
|
id: "home",
|
||||||
|
title: localization.string(for: "round.home"),
|
||||||
|
subtitle: localization.string(for: "round.selection_prompt"),
|
||||||
|
odds: "1.85"
|
||||||
|
),
|
||||||
|
SelectionOption(
|
||||||
|
id: "away",
|
||||||
|
title: localization.string(for: "round.away"),
|
||||||
|
subtitle: localization.string(for: "round.selection_prompt"),
|
||||||
|
odds: "2.05"
|
||||||
|
),
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private var selectedOutcome: SelectionOption? {
|
||||||
|
guard let selectedOutcomeID else {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return selectionOptions.first { $0.id == selectedOutcomeID }
|
||||||
|
}
|
||||||
|
|
||||||
|
private var winningOutcome: SelectionOption {
|
||||||
|
selectionOptions.first { $0.id == winningOutcomeID } ?? selectionOptions[0]
|
||||||
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack(alignment: .leading, spacing: HermesTheme.sectionSpacing) {
|
TimelineView(.periodic(from: Date(), by: 1)) { context in
|
||||||
HermesSectionHeader(
|
let remaining = max(lockAt.timeIntervalSince(context.date), 0)
|
||||||
title: localization.string(for: "round.title"),
|
let timerLocked = remaining <= 0
|
||||||
subtitle: localization.string(for: "round.subtitle")
|
let countdownText = Self.countdownText(for: remaining)
|
||||||
)
|
|
||||||
|
|
||||||
VStack(alignment: .leading, spacing: 14) {
|
VStack(alignment: .leading, spacing: HermesTheme.sectionSpacing) {
|
||||||
ZStack(alignment: .topTrailing) {
|
HermesSectionHeader(
|
||||||
RoundedRectangle(cornerRadius: HermesTheme.cornerRadius, style: .continuous)
|
title: localization.string(for: "round.title"),
|
||||||
.fill(
|
subtitle: localization.string(for: "round.subtitle")
|
||||||
LinearGradient(
|
)
|
||||||
colors: [HermesTheme.surfaceElevated, HermesTheme.background],
|
|
||||||
startPoint: .top,
|
|
||||||
endPoint: .bottom
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.frame(height: 200)
|
|
||||||
|
|
||||||
Text(localization.string(for: "round.video_placeholder"))
|
videoSection(countdownText: countdownText, remaining: remaining, isTimerLocked: timerLocked)
|
||||||
.font(.caption.weight(.semibold))
|
|
||||||
.foregroundStyle(HermesTheme.textSecondary)
|
|
||||||
.padding(12)
|
|
||||||
}
|
|
||||||
|
|
||||||
HStack(spacing: 12) {
|
phaseContent(isTimerLocked: timerLocked)
|
||||||
HermesCountdownBadge(
|
|
||||||
label: localization.string(for: "round.countdown_label"),
|
|
||||||
value: "00:47"
|
|
||||||
)
|
|
||||||
HermesMetricPill(label: localization.string(for: "round.odds_label"), value: "1.85 / 2.05")
|
|
||||||
}
|
|
||||||
|
|
||||||
Text(localization.string(for: "round.selection_prompt"))
|
|
||||||
.font(.callout)
|
|
||||||
.foregroundStyle(HermesTheme.textSecondary)
|
|
||||||
|
|
||||||
VStack(spacing: 10) {
|
|
||||||
ForEach(outcomeOptions) { option in
|
|
||||||
outcomeButton(option)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Button {
|
|
||||||
} label: {
|
|
||||||
Text(localization.string(for: "round.primary_cta"))
|
|
||||||
}
|
|
||||||
.buttonStyle(HermesPrimaryButtonStyle())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.hermesCard(elevated: true)
|
.hermesCard(elevated: true)
|
||||||
|
.onAppear {
|
||||||
|
startPreview()
|
||||||
|
}
|
||||||
|
.onDisappear {
|
||||||
|
transitionTask?.cancel()
|
||||||
|
playerCoordinator.pause()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func outcomeButton(_ option: OutcomeOption) -> some View {
|
@ViewBuilder
|
||||||
let isSelected = selectedOutcomeID == option.id
|
private func phaseContent(isTimerLocked: Bool) -> some View {
|
||||||
|
switch phase {
|
||||||
return Button {
|
case .preview, .locked:
|
||||||
selectedOutcomeID = option.id
|
SelectionView(
|
||||||
} label: {
|
statusText: isTimerLocked || phase != .preview ? localization.string(for: "round.locked_label") : localization.string(for: "round.selection_prompt"),
|
||||||
HStack {
|
options: selectionOptions,
|
||||||
VStack(alignment: .leading, spacing: 4) {
|
selectedOptionID: selectedOutcomeID,
|
||||||
Text(option.label)
|
isLocked: isTimerLocked || phase != .preview,
|
||||||
.font(.headline.weight(.semibold))
|
confirmTitle: localization.string(for: "round.primary_cta"),
|
||||||
Text(option.odds)
|
onSelect: handleSelection,
|
||||||
.font(.caption.weight(.semibold))
|
onConfirm: confirmSelection
|
||||||
.foregroundStyle(isSelected ? HermesTheme.background.opacity(0.72) : HermesTheme.textSecondary)
|
)
|
||||||
}
|
|
||||||
|
case .reveal:
|
||||||
Spacer()
|
RevealView(
|
||||||
|
title: localization.string(for: "reveal.title"),
|
||||||
Image(systemName: isSelected ? "checkmark.circle.fill" : "circle")
|
subtitle: localization.string(for: "reveal.subtitle"),
|
||||||
.font(.headline)
|
statusText: localization.string(for: "reveal.status"),
|
||||||
}
|
selectionLabel: localization.string(for: "result.selection_label"),
|
||||||
.padding(.horizontal, 16)
|
selectionValue: selectedOutcome?.title ?? localization.string(for: "round.selection_prompt"),
|
||||||
.padding(.vertical, 14)
|
continueTitle: localization.string(for: "reveal.cta"),
|
||||||
.foregroundStyle(isSelected ? HermesTheme.background : HermesTheme.textPrimary)
|
onContinue: showResult
|
||||||
.background(isSelected ? HermesTheme.accent : HermesTheme.surfaceElevated)
|
)
|
||||||
.overlay(
|
|
||||||
RoundedRectangle(cornerRadius: HermesTheme.insetRadius, style: .continuous)
|
case .result:
|
||||||
.stroke(isSelected ? HermesTheme.accent : HermesTheme.accent.opacity(0.14), lineWidth: 1)
|
ResultView(
|
||||||
|
title: localization.string(for: "result.title"),
|
||||||
|
subtitle: localization.string(for: "result.subtitle"),
|
||||||
|
selectionLabel: localization.string(for: "result.selection_label"),
|
||||||
|
selectionValue: selectedOutcome?.title ?? localization.string(for: "round.selection_prompt"),
|
||||||
|
outcomeLabel: localization.string(for: "result.outcome_label"),
|
||||||
|
outcomeValue: winningOutcome.title,
|
||||||
|
didWin: selectedOutcomeID == winningOutcomeID,
|
||||||
|
winLabel: localization.string(for: "result.win"),
|
||||||
|
loseLabel: localization.string(for: "result.lose"),
|
||||||
|
nextRoundTitle: localization.string(for: "result.next_round"),
|
||||||
|
onNextRound: resetRound
|
||||||
)
|
)
|
||||||
.clipShape(RoundedRectangle(cornerRadius: HermesTheme.insetRadius, style: .continuous))
|
|
||||||
}
|
}
|
||||||
.buttonStyle(.plain)
|
}
|
||||||
|
|
||||||
|
@ViewBuilder
|
||||||
|
private func videoSection(countdownText: String, remaining: TimeInterval, isTimerLocked: Bool) -> some View {
|
||||||
|
ZStack(alignment: .topTrailing) {
|
||||||
|
StudyVideoPlayerView(coordinator: playerCoordinator)
|
||||||
|
|
||||||
|
VStack(alignment: .trailing, spacing: 10) {
|
||||||
|
HermesCountdownBadge(
|
||||||
|
label: localization.string(for: "round.countdown_label"),
|
||||||
|
value: countdownText,
|
||||||
|
warning: !isTimerLocked && remaining <= 10
|
||||||
|
)
|
||||||
|
|
||||||
|
HermesMetricPill(
|
||||||
|
label: localization.string(for: "round.odds_label"),
|
||||||
|
value: "1.85 / 2.05"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
.padding(12)
|
||||||
|
|
||||||
|
Text(phaseLabel(isTimerLocked: isTimerLocked))
|
||||||
|
.font(.caption.weight(.bold))
|
||||||
|
.foregroundStyle(HermesTheme.textPrimary)
|
||||||
|
.padding(.horizontal, 12)
|
||||||
|
.padding(.vertical, 8)
|
||||||
|
.background(.black.opacity(0.35))
|
||||||
|
.clipShape(Capsule())
|
||||||
|
.padding(12)
|
||||||
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottomLeading)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func phaseLabel(isTimerLocked: Bool) -> String {
|
||||||
|
switch phase {
|
||||||
|
case .preview:
|
||||||
|
return isTimerLocked ? localization.string(for: "round.locked_label") : localization.string(for: "round.preview_label")
|
||||||
|
case .locked:
|
||||||
|
return localization.string(for: "round.locked_label")
|
||||||
|
case .reveal:
|
||||||
|
return localization.string(for: "reveal.title")
|
||||||
|
case .result:
|
||||||
|
return localization.string(for: "result.title")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func startPreview() {
|
||||||
|
transitionTask?.cancel()
|
||||||
|
phase = .preview
|
||||||
|
lockAt = Date().addingTimeInterval(previewDuration)
|
||||||
|
selectedOutcomeID = nil
|
||||||
|
playerCoordinator.restart()
|
||||||
|
|
||||||
|
analytics.track("round_loaded", attributes: ["screen_name": "round"])
|
||||||
|
analytics.track("preview_started", attributes: ["screen_name": "round"])
|
||||||
|
analytics.track("screen_viewed", attributes: ["screen_name": "round"])
|
||||||
|
}
|
||||||
|
|
||||||
|
private func handleSelection(_ option: SelectionOption) {
|
||||||
|
guard phase == .preview else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
selectedOutcomeID = option.id
|
||||||
|
analytics.track("outcome_focused", attributes: ["screen_name": "round", "outcome_id": option.id])
|
||||||
|
analytics.track("outcome_selected", attributes: ["screen_name": "round", "outcome_id": option.id])
|
||||||
|
}
|
||||||
|
|
||||||
|
private func confirmSelection() {
|
||||||
|
guard phase == .preview, let selectedOutcomeID else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
analytics.track("selection_submitted", attributes: ["screen_name": "round", "outcome_id": selectedOutcomeID])
|
||||||
|
analytics.track("selection_accepted", attributes: ["screen_name": "round", "outcome_id": selectedOutcomeID])
|
||||||
|
analytics.track("market_locked", attributes: ["screen_name": "round", "lock_reason": "manual_selection"])
|
||||||
|
|
||||||
|
phase = .locked
|
||||||
|
playerCoordinator.pause()
|
||||||
|
|
||||||
|
transitionTask?.cancel()
|
||||||
|
transitionTask = Task { @MainActor in
|
||||||
|
try? await Task.sleep(nanoseconds: 750_000_000)
|
||||||
|
guard !Task.isCancelled else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
phase = .reveal
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func showResult() {
|
||||||
|
analytics.track("reveal_completed", attributes: ["screen_name": "round"])
|
||||||
|
phase = .result
|
||||||
|
}
|
||||||
|
|
||||||
|
private func resetRound() {
|
||||||
|
transitionTask?.cancel()
|
||||||
|
selectedOutcomeID = nil
|
||||||
|
phase = .preview
|
||||||
|
lockAt = Date().addingTimeInterval(previewDuration)
|
||||||
|
playerCoordinator.restart()
|
||||||
|
}
|
||||||
|
|
||||||
|
private static func countdownText(for remaining: TimeInterval) -> String {
|
||||||
|
let totalSeconds = max(Int(remaining.rounded(.down)), 0)
|
||||||
|
let minutes = totalSeconds / 60
|
||||||
|
let seconds = totalSeconds % 60
|
||||||
|
return String(format: "%02d:%02d", minutes, seconds)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,90 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
|
struct SelectionOption: Identifiable, Equatable {
|
||||||
|
let id: String
|
||||||
|
let title: String
|
||||||
|
let subtitle: String
|
||||||
|
let odds: String
|
||||||
|
}
|
||||||
|
|
||||||
struct SelectionView: View {
|
struct SelectionView: View {
|
||||||
|
let statusText: String
|
||||||
|
let options: [SelectionOption]
|
||||||
|
let selectedOptionID: String?
|
||||||
|
let isLocked: Bool
|
||||||
|
let confirmTitle: String
|
||||||
|
let onSelect: (SelectionOption) -> Void
|
||||||
|
let onConfirm: () -> Void
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Text("Selection scaffold")
|
VStack(alignment: .leading, spacing: HermesTheme.sectionSpacing) {
|
||||||
|
statusBadge
|
||||||
|
|
||||||
|
VStack(spacing: 10) {
|
||||||
|
ForEach(options) { option in
|
||||||
|
optionButton(option)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Button {
|
||||||
|
onConfirm()
|
||||||
|
} label: {
|
||||||
|
Text(confirmTitle)
|
||||||
|
}
|
||||||
|
.buttonStyle(HermesPrimaryButtonStyle())
|
||||||
|
.disabled(isLocked || selectedOptionID == nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private var statusBadge: some View {
|
||||||
|
HStack(spacing: 8) {
|
||||||
|
Image(systemName: isLocked ? "lock.fill" : "hand.tap.fill")
|
||||||
|
.font(.caption.weight(.semibold))
|
||||||
|
Text(statusText)
|
||||||
|
.font(.caption.weight(.semibold))
|
||||||
|
}
|
||||||
|
.foregroundStyle(isLocked ? HermesTheme.warning : HermesTheme.textSecondary)
|
||||||
|
.padding(.horizontal, 12)
|
||||||
|
.padding(.vertical, 8)
|
||||||
|
.background((isLocked ? HermesTheme.warning : HermesTheme.accent).opacity(0.16))
|
||||||
|
.clipShape(Capsule())
|
||||||
|
}
|
||||||
|
|
||||||
|
private func optionButton(_ option: SelectionOption) -> some View {
|
||||||
|
let selected = selectedOptionID == option.id
|
||||||
|
|
||||||
|
return Button {
|
||||||
|
onSelect(option)
|
||||||
|
} label: {
|
||||||
|
HStack(alignment: .center, spacing: 14) {
|
||||||
|
VStack(alignment: .leading, spacing: 4) {
|
||||||
|
Text(option.title)
|
||||||
|
.font(.headline.weight(.semibold))
|
||||||
|
Text(option.subtitle)
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundStyle(selected ? HermesTheme.background.opacity(0.68) : HermesTheme.textSecondary)
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(minLength: 8)
|
||||||
|
|
||||||
|
VStack(alignment: .trailing, spacing: 4) {
|
||||||
|
Text(option.odds)
|
||||||
|
.font(.headline.weight(.bold))
|
||||||
|
Image(systemName: selected ? "checkmark.circle.fill" : "circle")
|
||||||
|
.font(.subheadline.weight(.semibold))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.padding(.horizontal, 16)
|
||||||
|
.padding(.vertical, 14)
|
||||||
|
.foregroundStyle(selected ? HermesTheme.background : HermesTheme.textPrimary)
|
||||||
|
.background(selected ? HermesTheme.accent : HermesTheme.surfaceElevated)
|
||||||
|
.overlay(
|
||||||
|
RoundedRectangle(cornerRadius: HermesTheme.insetRadius, style: .continuous)
|
||||||
|
.stroke(selected ? HermesTheme.accent : HermesTheme.accent.opacity(0.14), lineWidth: 1)
|
||||||
|
)
|
||||||
|
.clipShape(RoundedRectangle(cornerRadius: HermesTheme.insetRadius, style: .continuous))
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
.disabled(isLocked)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
"round.title" = "Active round";
|
"round.title" = "Active round";
|
||||||
"round.subtitle" = "Make your choice before lock, then wait for the reveal.";
|
"round.subtitle" = "Make your choice before lock, then wait for the reveal.";
|
||||||
"round.video_placeholder" = "Video preview";
|
"round.video_placeholder" = "Video preview";
|
||||||
|
"round.preview_label" = "Preview playing";
|
||||||
"round.countdown_label" = "Lock in";
|
"round.countdown_label" = "Lock in";
|
||||||
"round.odds_label" = "Odds";
|
"round.odds_label" = "Odds";
|
||||||
"round.selection_prompt" = "Choose an outcome.";
|
"round.selection_prompt" = "Choose an outcome.";
|
||||||
@@ -23,3 +24,14 @@
|
|||||||
"round.locked_label" = "Locked";
|
"round.locked_label" = "Locked";
|
||||||
"round.home" = "Home";
|
"round.home" = "Home";
|
||||||
"round.away" = "Away";
|
"round.away" = "Away";
|
||||||
|
"reveal.title" = "Reveal";
|
||||||
|
"reveal.subtitle" = "The clip is now showing the outcome.";
|
||||||
|
"reveal.status" = "Reveal segment is playing.";
|
||||||
|
"reveal.cta" = "See result";
|
||||||
|
"result.title" = "Result";
|
||||||
|
"result.subtitle" = "Your selection versus the actual outcome.";
|
||||||
|
"result.selection_label" = "Your selection";
|
||||||
|
"result.outcome_label" = "Outcome";
|
||||||
|
"result.win" = "Winning selection";
|
||||||
|
"result.lose" = "Not this time";
|
||||||
|
"result.next_round" = "Next round";
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
"round.title" = "Aktiv runda";
|
"round.title" = "Aktiv runda";
|
||||||
"round.subtitle" = "Gör ditt val före låsning och vänta sedan på avslöjandet.";
|
"round.subtitle" = "Gör ditt val före låsning och vänta sedan på avslöjandet.";
|
||||||
"round.video_placeholder" = "Videoförhandsvisning";
|
"round.video_placeholder" = "Videoförhandsvisning";
|
||||||
|
"round.preview_label" = "Förhandsvisning spelas";
|
||||||
"round.countdown_label" = "Låsning om";
|
"round.countdown_label" = "Låsning om";
|
||||||
"round.odds_label" = "Odds";
|
"round.odds_label" = "Odds";
|
||||||
"round.selection_prompt" = "Välj ett utfall.";
|
"round.selection_prompt" = "Välj ett utfall.";
|
||||||
@@ -23,3 +24,14 @@
|
|||||||
"round.locked_label" = "Låst";
|
"round.locked_label" = "Låst";
|
||||||
"round.home" = "Hemma";
|
"round.home" = "Hemma";
|
||||||
"round.away" = "Borta";
|
"round.away" = "Borta";
|
||||||
|
"reveal.title" = "Avslöjande";
|
||||||
|
"reveal.subtitle" = "Klippet visar nu utfallet.";
|
||||||
|
"reveal.status" = "Avslöjningssegmentet spelas upp.";
|
||||||
|
"reveal.cta" = "Se resultat";
|
||||||
|
"result.title" = "Resultat";
|
||||||
|
"result.subtitle" = "Ditt val jämfört med det faktiska utfallet.";
|
||||||
|
"result.selection_label" = "Ditt val";
|
||||||
|
"result.outcome_label" = "Utfall";
|
||||||
|
"result.win" = "Vinnande val";
|
||||||
|
"result.lose" = "Inte denna gång";
|
||||||
|
"result.next_round" = "Nästa runda";
|
||||||
|
|||||||
Reference in New Issue
Block a user