chore(lint): SwiftLint-Config + 0-Warnings-Pass + Swift-6-Concurrency-Fixes

Bringt cards-native auf 0 SwiftLint-Violations bei 75 Files. Build-Status
unverändert grün (xcodebuild iOS Debug).

.swiftlint.yml
- identifier_name excludes erweitert um math/index-Konventionen
  (i, j, n, m, x, y, w, h, r, g, b, a, c, d, s, f, p, q, t, l) —
  in algorithmischem Code klarer als verbose
- opening_brace disabled — kollidiert mit SwiftFormats
  wrapMultilineStatementBraces (SwiftFormat ist im Pre-Commit-Hook
  und gewinnt)

Code-Modernisierungen (real, nicht nur Annotations)
- Cloze.swift: regex-Tuple bekommt `swiftlint:disable large_tuple`-
  Region — Regex-Output-Type ist Builder-bedingt nicht reduzierbar
- Media.swift: `data(using: .utf8)` → `Data(s.utf8)` (non-failable),
  `String(data:as:)` → `String(bytes:encoding:)`
- CardsTheme.swift: HSL-Wert-Typ statt anonymes 3-Tupel —
  konkretere Call-Sites, kein `large_tuple`-Warning mehr
- MediaCache.swift: `CacheEntry`-Struct statt 3-Tupel im Prune-Pfad
- GradeQueue / MediaCache / StudySession / MarketplaceStore: OSLog-
  Interpolations auf lokale Variablen ziehen — fixt Swift-6-Strict-
  Concurrency-Fail bei Actor-isolated-Property-Zugriff aus
  @Sendable-Autoclosure
- DeckMutations.swift, MarketplaceModeration.swift: verschachtelte
  VersionInfo-Sub-Types auf Top-Level (`PullUpdateVersion`,
  `OwnedMarketplaceVersion`) — fixt `nesting`-Warning
- Tests/UnitTests/*.swift: alle `""".data(using: .utf8)!` migriert auf
  `Data("""…""".utf8)`; force-cast `as!` in MutationEncodingTests
  durch guard-let + throw ersetzt

Pragmatische Disables (mit Doc-Comment-Begründung)
- DeckEditorView / MarketplacePublishView / DeckDetailView /
  PublicDeckView / DeckListView / CardEditorView / CardsAPI:
  `swiftlint:disable type_body_length` (+ teilweise file_length)
  als Region-Disable mit `enable` nach dem Struct. Begründung im
  Doc-Comment: Multi-State-Maschinen mit shared Toolbar + Sheets;
  Aufspalten würde nur @Binding-Plumbing produzieren

Auto-Format-Aufräumung
- Redundante `Sendable`-Conformance entfernt (Swift 6 leitet das
  bei Wert-Typen mit Sendable-Mitgliedern automatisch ab)
- EnvironmentValues nutzt jetzt @Entry-Macro statt manueller
  EnvironmentKey-Boilerplate
- Brace-Reformatting + Import-Sortierung auf allen 75 Files

Ergebnis: 80 Warnings + 3 Errors → 0 / 0.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Till JS 2026-05-14 02:04:29 +02:00
parent 73f9081fa1
commit aece169360
37 changed files with 489 additions and 349 deletions

View file

@ -38,7 +38,6 @@ struct CardRenderer: View {
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
@ViewBuilder
private func basicView(front frontKey: String, back backKey: String) -> some View {
VStack(spacing: 16) {
text(card.fields[frontKey] ?? "")
@ -131,7 +130,6 @@ struct CardRenderer: View {
}
}
@ViewBuilder
private var placeholderView: some View {
VStack(spacing: 8) {
Image(systemName: "questionmark.square.dashed")

View file

@ -15,10 +15,10 @@ struct MultipleChoiceCardView: View {
@State private var selected: String?
@State private var phase: LoadPhase = .loading
enum LoadPhase: Sendable {
enum LoadPhase {
case loading
case ready
case tooFew // < 1 Distractor manueller Modus
case tooFew // < 1 Distractor manueller Modus
case failed
}
@ -82,7 +82,10 @@ struct MultipleChoiceCardView: View {
}
.padding(.vertical, 12)
.padding(.horizontal, 14)
.background(background(isCorrect: isCorrect, isSelected: isSelected), in: RoundedRectangle(cornerRadius: 10, style: .continuous))
.background(
background(isCorrect: isCorrect, isSelected: isSelected),
in: RoundedRectangle(cornerRadius: 10, style: .continuous)
)
.overlay(
RoundedRectangle(cornerRadius: 10, style: .continuous)
.stroke(border(isCorrect: isCorrect, isSelected: isSelected), lineWidth: 1)

View file

@ -1,7 +1,7 @@
import SwiftUI
#if canImport(UIKit)
import UIKit
import UIKit
#endif
/// Vier Rating-Buttons mit emphasis auf "Good" (full-width primary).
@ -85,9 +85,9 @@ struct RatingBar: View {
private func triggerHaptic(for rating: Rating) {
#if canImport(UIKit)
let style: UIImpactFeedbackGenerator.FeedbackStyle =
rating == .easy ? .heavy : .medium
UIImpactFeedbackGenerator(style: style).impactOccurred()
let style: UIImpactFeedbackGenerator.FeedbackStyle =
rating == .easy ? .heavy : .medium
UIImpactFeedbackGenerator(style: style).impactOccurred()
#endif
}
}

View file

@ -8,7 +8,7 @@ import SwiftData
@MainActor
@Observable
final class StudySession {
enum Phase: Sendable {
enum Phase {
case loading
case studying
case finished
@ -55,7 +55,9 @@ final class StudySession {
} else {
phase = .studying
}
Log.study.info("Session start — \(self.queue.count, privacy: .public) due in deck \(self.deckId, privacy: .public)")
let count = queue.count
let id = deckId
Log.study.info("Session start — \(count, privacy: .public) due in deck \(id, privacy: .public)")
} catch {
let msg = (error as? LocalizedError)?.errorDescription ?? String(describing: error)
phase = .failed(msg)
@ -86,7 +88,8 @@ final class StudySession {
isFlipped = false
if currentIndex >= queue.count {
phase = .finished
Log.study.info("Session finished — graded \(self.totalGraded, privacy: .public)")
let count = totalGraded
Log.study.info("Session finished — graded \(count, privacy: .public)")
}
}
}

View file

@ -19,8 +19,13 @@ struct TypingCardView: View {
@State private var result: TypingMatch?
@FocusState private var inputFocused: Bool
private var answer: String { card.fields["answer"] ?? "" }
private var aliases: String? { card.fields["aliases"] }
private var answer: String {
card.fields["answer"] ?? ""
}
private var aliases: String? {
card.fields["aliases"]
}
var body: some View {
VStack(alignment: .leading, spacing: 16) {
@ -67,9 +72,9 @@ struct TypingCardView: View {
.stroke(inputFocused ? CardsTheme.primary : CardsTheme.border, lineWidth: 1)
)
.autocorrectionDisabled()
#if os(iOS)
#if os(iOS)
.textInputAutocapitalization(.never)
#endif
#endif
.onSubmit { submit() }
Button {
@ -140,9 +145,9 @@ struct TypingCardView: View {
private func triggerHaptic() {
#if canImport(UIKit)
let style: UIImpactFeedbackGenerator.FeedbackStyle =
result == .correct ? .heavy : .light
UIImpactFeedbackGenerator(style: style).impactOccurred()
let style: UIImpactFeedbackGenerator.FeedbackStyle =
result == .correct ? .heavy : .light
UIImpactFeedbackGenerator(style: style).impactOccurred()
#endif
}
@ -183,5 +188,5 @@ struct TypingCardView: View {
}
#if canImport(UIKit)
import UIKit
import UIKit
#endif