Code + Identity-Rename zur Vorbereitung auf Apple-Dev-Portal-Aktion (Bundle ev.mana.wordeck, App-Group group.ev.mana.wordeck, AASA applinks:wordeck.com). Build bleibt funktional, aber gegen die neue text-only-API können image-occlusion-Creates 422 zurückgeben — das wird mit der Wordeck-Native v1.0-Welle (parallele Apple-Aktion) sauber gemacht. Umbenennung: - 41 Files: cardecky/Cardecky → wordeck/Wordeck (Display, Strings, Kommentare) - 57 Files: CardsNative → WordeckNative, CardsAPI → WordeckAPI, CardsTheme → WordeckTheme, CardsBrand → WordeckBrand, CardsWidget → WordeckWidget, CardsDueWidget → WordeckDueWidget - Bundle-ID ev.mana.cardecky → ev.mana.wordeck (project.yml, Info.plist, entitlements, Keychain-Service, App-Group) - AASA applinks:cardecky.mana.how → applinks:wordeck.com - API-Base cardecky-api.mana.how → api.wordeck.com - 10 Files renamed (App-Entry, API-Extensions, Theme, Widget, Entitlements, Tests) - xcodeproj regenerated via xcodegen → WordeckNative.xcodeproj - MaskRegionsTests.swift gelöscht (image-occlusion entfällt mit Wordeck text-only) Forgejo-Repo git.mana.how/till/cards-native → wordeck-native umbenannt (Auto-Redirect aktiv). Lokales Verzeichnis Code/cards-native/ bleibt vorerst — wird beim nächsten Apple-Setup mit Bundle-Test umbenannt. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
196 lines
6.8 KiB
Swift
196 lines
6.8 KiB
Swift
import ManaCore
|
|
import SwiftData
|
|
import SwiftUI
|
|
|
|
#if canImport(UIKit)
|
|
import UIKit
|
|
#endif
|
|
|
|
/// Vollbild-Study-View. Wird per Navigation aus DeckListView geöffnet.
|
|
struct StudySessionView: View {
|
|
let deckId: String
|
|
let deckName: String
|
|
|
|
@Environment(AuthClient.self) private var auth
|
|
@Environment(\.modelContext) private var context
|
|
@Environment(\.dismiss) private var dismiss
|
|
@State private var session: StudySession?
|
|
|
|
var body: some View {
|
|
ZStack {
|
|
WordeckTheme.background.ignoresSafeArea()
|
|
content
|
|
}
|
|
.navigationTitle(deckName)
|
|
#if os(iOS)
|
|
.navigationBarTitleDisplayMode(.inline)
|
|
#endif
|
|
.toolbar {
|
|
ToolbarItem(placement: .topBarTrailing) {
|
|
if let session, case .studying = session.phase {
|
|
Text("\(session.remaining)")
|
|
.font(.subheadline.weight(.semibold))
|
|
.foregroundStyle(WordeckTheme.mutedForeground)
|
|
.accessibilityLabel("\(session.remaining) Karten übrig")
|
|
}
|
|
}
|
|
}
|
|
.task {
|
|
if session == nil {
|
|
let s = StudySession(deckId: deckId, deckName: deckName, auth: auth, context: context)
|
|
session = s
|
|
await s.start()
|
|
}
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var content: some View {
|
|
if let session {
|
|
switch session.phase {
|
|
case .loading:
|
|
ProgressView("Karten werden geladen …")
|
|
.tint(WordeckTheme.primary)
|
|
case .studying:
|
|
studyingView(session: session)
|
|
case .finished:
|
|
finishedView(session: session)
|
|
case let .failed(message):
|
|
failedView(message: message, session: session)
|
|
}
|
|
} else {
|
|
ProgressView()
|
|
.tint(WordeckTheme.primary)
|
|
}
|
|
}
|
|
|
|
private func studyingView(session: StudySession) -> some View {
|
|
VStack(spacing: 16) {
|
|
if let due = session.current {
|
|
cardSurface(due: due, isFlipped: session.isFlipped)
|
|
.onTapGesture {
|
|
flipHaptic()
|
|
session.flip()
|
|
}
|
|
keyboardShortcuts(session: session)
|
|
bottomBar(session: session)
|
|
}
|
|
}
|
|
.padding(.bottom, 20)
|
|
.animation(.easeInOut(duration: 0.2), value: session.isFlipped)
|
|
.animation(.easeInOut(duration: 0.2), value: session.currentIndex)
|
|
}
|
|
|
|
/// Fixe Höhe, damit der Wechsel zwischen "Antwort anzeigen" und
|
|
/// `RatingBar` die Card oben nicht stauchen kann — sonst proportioniert
|
|
/// `.aspectRatio(.fit)` die Card neu und das Layout springt.
|
|
private func bottomBar(session: StudySession) -> some View {
|
|
ZStack {
|
|
if session.isFlipped {
|
|
RatingBar { rating in
|
|
Task { await session.grade(rating) }
|
|
}
|
|
.transition(.opacity)
|
|
} else {
|
|
Button {
|
|
flipHaptic()
|
|
session.flip()
|
|
} label: {
|
|
Text("Antwort anzeigen")
|
|
.font(.subheadline.weight(.semibold))
|
|
.frame(maxWidth: .infinity)
|
|
.padding(.vertical, 14)
|
|
.background(WordeckTheme.primary, in: RoundedRectangle(cornerRadius: 10))
|
|
.foregroundStyle(WordeckTheme.primaryForeground)
|
|
}
|
|
.buttonStyle(.plain)
|
|
.padding(.horizontal, 16)
|
|
.transition(.opacity)
|
|
}
|
|
}
|
|
.frame(height: 52)
|
|
}
|
|
|
|
private func cardSurface(due: DueReview, isFlipped: Bool) -> some View {
|
|
CardSurface(size: .hero, elevation: .raised) {
|
|
CardRenderer(
|
|
card: due.card,
|
|
subIndex: due.review.subIndex,
|
|
isFlipped: isFlipped
|
|
)
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
}
|
|
.padding(.horizontal, 16)
|
|
.padding(.top, 12)
|
|
}
|
|
|
|
private func finishedView(session: StudySession) -> some View {
|
|
VStack(spacing: 16) {
|
|
Image(systemName: "checkmark.seal.fill")
|
|
.font(.system(size: 64))
|
|
.foregroundStyle(WordeckTheme.success)
|
|
Text(session.totalGraded == 0 ? "Keine Karten fällig" : "Fertig!")
|
|
.font(.title.bold())
|
|
.foregroundStyle(WordeckTheme.foreground)
|
|
if session.totalGraded > 0 {
|
|
Text("\(session.totalGraded) Karten gelernt")
|
|
.font(.subheadline)
|
|
.foregroundStyle(WordeckTheme.mutedForeground)
|
|
}
|
|
Button("Zurück") { dismiss() }
|
|
.padding(.top, 24)
|
|
}
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
}
|
|
|
|
private func failedView(message: String, session: StudySession) -> some View {
|
|
VStack(spacing: 16) {
|
|
Image(systemName: "wifi.exclamationmark")
|
|
.font(.system(size: 48))
|
|
.foregroundStyle(WordeckTheme.error)
|
|
Text("Karten konnten nicht geladen werden")
|
|
.font(.headline)
|
|
.foregroundStyle(WordeckTheme.foreground)
|
|
Text(message)
|
|
.font(.caption)
|
|
.multilineTextAlignment(.center)
|
|
.foregroundStyle(WordeckTheme.mutedForeground)
|
|
.padding(.horizontal, 32)
|
|
Button("Erneut versuchen") {
|
|
Task { await session.start() }
|
|
}
|
|
.padding(.top, 16)
|
|
}
|
|
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
|
}
|
|
|
|
/// Unsichtbare Buttons mit Keyboard-Shortcuts. Funktionieren auf
|
|
/// iPad (Magic Keyboard) und macOS. Space = flip, 1-4 = Rating.
|
|
private func keyboardShortcuts(session: StudySession) -> some View {
|
|
Group {
|
|
Button("Flip") {
|
|
flipHaptic()
|
|
session.flip()
|
|
}
|
|
.keyboardShortcut(.space, modifiers: [])
|
|
|
|
if session.isFlipped {
|
|
ForEach(Rating.allCases, id: \.self) { rating in
|
|
Button(rating.label) {
|
|
Task { await session.grade(rating) }
|
|
}
|
|
.keyboardShortcut(KeyEquivalent(Character(rating.shortcut)), modifiers: [])
|
|
}
|
|
}
|
|
}
|
|
.frame(width: 0, height: 0)
|
|
.opacity(0)
|
|
.accessibilityHidden(true)
|
|
}
|
|
|
|
private func flipHaptic() {
|
|
#if canImport(UIKit)
|
|
UIImpactFeedbackGenerator(style: .soft).impactOccurred()
|
|
#endif
|
|
}
|
|
}
|