feat(decks): Tile-Redesign — Tap=Study, Edit-Icon, Explore-Konsistenz

User-Feedback umgesetzt:
- Tap auf Deck-Tile öffnet jetzt direkt den Study-Mode für dieses
  Deck (statt Deck-Detail). DeckRoute-Enum mit .study/.detail-Cases
  + programmatic NavigationPath.
- Edit-Icon (Pencil) unten rechts auf der Tile in Muted-Circle-Badge;
  Tap führt in den Deck-Detail-View (Browse Cards + Bearbeiten).
- Kategorie-Icon oben rechts jetzt in primary-Farbe (war muted) +
  größer (.title2 statt .title3) — visuell prominenter.
- Inbox-Banner ist jetzt als Button → Study-Mode mit dem ersten
  Inbox-Deck.

ExploreView/PublicDeckCard:
- Selbes Tile-Layout wie DeckStackTile (5:7 Aspect-Ratio, CardSurface,
  Kategorie-Icon oben rechts, Footer mit Counts + Owner).
- Featured-Star-Badge oben links statt rechts (damit Kategorie-Icon
  konsistent rechts bleibt).
- Star-Count als ausgefüllter Stern in warning-Farbe.
- Owner-Name unter den Counts, mit verified-Seal wenn vorhanden.

Build 10 → 11. 43 Tests grün.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Till JS 2026-05-13 18:03:47 +02:00
parent 33101d703d
commit 90201d7199
4 changed files with 153 additions and 73 deletions

View file

@ -2,6 +2,14 @@ import ManaCore
import SwiftData import SwiftData
import SwiftUI import SwiftUI
/// Navigations-Routen für die DeckListView. Tap auf eine Tile geht
/// direkt in Study-Mode, Tap auf den Edit-Button in den Deck-Detail-
/// View für Browse + Edit.
enum DeckRoute: Hashable {
case study(deckId: String, deckName: String)
case detail(deckId: String)
}
/// Decks-Hauptbildschirm im Cardecky-Look: horizontale Scroll-Reihen /// Decks-Hauptbildschirm im Cardecky-Look: horizontale Scroll-Reihen
/// mit Fan-Stack-Karten-Tiles. Web-Vorbild: /// mit Fan-Stack-Karten-Tiles. Web-Vorbild:
/// `cards/apps/web/src/routes/decks/+page.svelte`. /// `cards/apps/web/src/routes/decks/+page.svelte`.
@ -14,17 +22,23 @@ struct DeckListView: View {
@State private var showAccount = false @State private var showAccount = false
@State private var showCreate = false @State private var showCreate = false
@State private var pendingShares: [PendingShare] = [] @State private var pendingShares: [PendingShare] = []
@State private var path = NavigationPath()
var body: some View { var body: some View {
NavigationStack { NavigationStack(path: $path) {
ZStack { ZStack {
CardsTheme.background.ignoresSafeArea() CardsTheme.background.ignoresSafeArea()
content content
} }
.navigationTitle("Decks") .navigationTitle("Decks")
.navigationDestination(for: String.self) { deckId in .navigationDestination(for: DeckRoute.self) { route in
switch route {
case let .study(deckId, deckName):
StudySessionView(deckId: deckId, deckName: deckName)
case let .detail(deckId):
DeckDetailView(deckId: deckId) DeckDetailView(deckId: deckId)
} }
}
.navigationDestination(for: PendingShareRoute.self) { route in .navigationDestination(for: PendingShareRoute.self) { route in
PendingShareConsumeView(share: route.share, onDone: { PendingShareConsumeView(share: route.share, onDone: {
PendingShareStore.remove(id: route.share.id) PendingShareStore.remove(id: route.share.id)
@ -111,11 +125,12 @@ struct DeckListView: View {
ScrollView(.horizontal, showsIndicators: false) { ScrollView(.horizontal, showsIndicators: false) {
HStack(alignment: .top, spacing: 16) { HStack(alignment: .top, spacing: 16) {
ForEach(decks) { deck in ForEach(decks) { deck in
NavigationLink(value: deck.id) { DeckStackTile(
DeckStackTile(deck: deck) deck: deck,
onTap: { path.append(DeckRoute.study(deckId: deck.id, deckName: deck.name)) },
onEdit: { path.append(DeckRoute.detail(deckId: deck.id)) }
)
.frame(width: 240) .frame(width: 240)
}
.buttonStyle(.plain)
.scrollTransition(.animated) { content, phase in .scrollTransition(.animated) { content, phase in
content content
.scaleEffect(phase.isIdentity ? 1 : 0.92) .scaleEffect(phase.isIdentity ? 1 : 0.92)
@ -135,6 +150,9 @@ struct DeckListView: View {
@ViewBuilder @ViewBuilder
private var inboxBanner: some View { private var inboxBanner: some View {
if let inbox = decks.first(where: { $0.isFromMarketplace && $0.dueCount > 0 }) { if let inbox = decks.first(where: { $0.isFromMarketplace && $0.dueCount > 0 }) {
Button {
path.append(DeckRoute.study(deckId: inbox.id, deckName: inbox.name))
} label: {
HStack(spacing: 12) { HStack(spacing: 12) {
Image(systemName: "tray.full.fill") Image(systemName: "tray.full.fill")
.font(.title3) .font(.title3)
@ -160,6 +178,8 @@ struct DeckListView: View {
) )
.padding(.horizontal, 20) .padding(.horizontal, 20)
} }
.buttonStyle(.plain)
}
} }
@ViewBuilder @ViewBuilder

View file

@ -4,10 +4,14 @@ import SwiftUI
/// Layern hinter einer `CardSurface`. Web-Vorbild: /// Layern hinter einer `CardSurface`. Web-Vorbild:
/// `cards/apps/web/src/lib/components/DeckStack.svelte`. /// `cards/apps/web/src/lib/components/DeckStack.svelte`.
/// ///
/// Die Layer-Offsets + Tilts sind deterministisch aus der Deck-ID /// Layout: Kategorie-Icon oben rechts (prominent in primary-Farbe),
/// gehasht gleiches Deck zeigt immer gleiche Asymmetrie. /// Titel + Description zentriert, Counts + Edit-Button unten.
/// Tap auf die Tile triggert `onTap` (Study-Mode), Tap auf den
/// Edit-Button triggert `onEdit` (Deck-Detail).
struct DeckStackTile: View { struct DeckStackTile: View {
let deck: CachedDeck let deck: CachedDeck
let onTap: () -> Void
let onEdit: () -> Void
var body: some View { var body: some View {
ZStack { ZStack {
@ -31,6 +35,8 @@ struct DeckStackTile: View {
} }
.aspectRatio(5.0 / 7.0, contentMode: .fit) .aspectRatio(5.0 / 7.0, contentMode: .fit)
.frame(maxWidth: 280) .frame(maxWidth: 280)
.contentShape(Rectangle())
.onTapGesture { onTap() }
} }
private var cardContent: some View { private var cardContent: some View {
@ -38,8 +44,8 @@ struct DeckStackTile: View {
HStack(alignment: .top) { HStack(alignment: .top) {
Spacer() Spacer()
Image(systemName: deck.category?.systemImageName ?? "rectangle.stack") Image(systemName: deck.category?.systemImageName ?? "rectangle.stack")
.font(.title3) .font(.title2)
.foregroundStyle(CardsTheme.mutedForeground.opacity(0.85)) .foregroundStyle(CardsTheme.primary.opacity(0.85))
} }
Spacer(minLength: 0) Spacer(minLength: 0)
@ -72,17 +78,37 @@ struct DeckStackTile: View {
.background(CardsTheme.primary.opacity(0.15), in: Capsule()) .background(CardsTheme.primary.opacity(0.15), in: Capsule())
.foregroundStyle(CardsTheme.primary) .foregroundStyle(CardsTheme.primary)
} }
Spacer()
if deck.isFromMarketplace { if deck.isFromMarketplace {
Image(systemName: "globe") Image(systemName: "globe")
.font(.caption2) .font(.caption2)
.foregroundStyle(CardsTheme.mutedForeground) .foregroundStyle(CardsTheme.mutedForeground)
} }
Spacer()
editButton
} }
} }
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading) .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
} }
/// Edit-Button unten rechts. Eigener `Button` mit `.plain` style
/// fängt den Tap und triggert nicht das Outer-`onTapGesture`.
private var editButton: some View {
Button {
onEdit()
} label: {
Image(systemName: "pencil")
.font(.footnote.weight(.semibold))
.foregroundStyle(CardsTheme.mutedForeground)
.frame(width: 30, height: 30)
.background(CardsTheme.muted.opacity(0.7), in: Circle())
.overlay(
Circle().stroke(CardsTheme.border, lineWidth: 1)
)
}
.buttonStyle(.plain)
.accessibilityLabel("Deck bearbeiten")
}
/// Deterministische Stack-Layer aus Deck-ID gehasht. /// Deterministische Stack-Layer aus Deck-ID gehasht.
private var layers: [StackLayer] { private var layers: [StackLayer] {
var hash = UInt64(0) var hash = UInt64(0)
@ -112,7 +138,7 @@ private struct StackLayer {
let opacity: Double let opacity: Double
} }
private extension DeckCategory { extension DeckCategory {
var systemImageName: String { var systemImageName: String {
switch self { switch self {
case .language: "character.book.closed" case .language: "character.book.closed"

View file

@ -124,44 +124,74 @@ enum MarketplaceRoute: Hashable {
} }
/// Public-Deck-Karten-Tile in Featured/Trending-Carousels und Browse-Grid. /// Public-Deck-Karten-Tile in Featured/Trending-Carousels und Browse-Grid.
/// Selbes Tile-Layout wie DeckStackTile (5:7 Aspect-Ratio,
/// CardSurface, Kategorie-Icon oben rechts), aber für PublicDeckEntry-
/// Daten. Star-Count statt Edit-Button unten rechts.
struct PublicDeckCard: View { struct PublicDeckCard: View {
let entry: PublicDeckEntry let entry: PublicDeckEntry
var body: some View { var body: some View {
VStack(alignment: .leading, spacing: 8) { ZStack {
HStack { CardSurface(size: .md, elevation: .standard, colorAccentHex: nil) {
Text(entry.title) cardContent
.font(.headline) }
.foregroundStyle(CardsTheme.foreground) }
.lineLimit(2) .aspectRatio(5.0 / 7.0, contentMode: .fit)
Spacer() .frame(maxWidth: 280)
}
private var cardContent: some View {
VStack(alignment: .leading, spacing: 6) {
HStack(alignment: .top) {
if entry.isFeatured { if entry.isFeatured {
Image(systemName: "star.fill") Image(systemName: "star.fill")
.font(.caption) .font(.caption)
.foregroundStyle(CardsTheme.warning) .foregroundStyle(CardsTheme.warning)
} }
Spacer()
Image(systemName: categorySymbol)
.font(.title2)
.foregroundStyle(CardsTheme.primary.opacity(0.85))
} }
Spacer(minLength: 0)
VStack(alignment: .leading, spacing: 6) {
Text(entry.title)
.font(.system(size: 17, weight: .semibold))
.foregroundStyle(CardsTheme.foreground)
.lineLimit(3)
if let description = entry.description, !description.isEmpty { if let description = entry.description, !description.isEmpty {
Text(description) Text(description)
.font(.caption) .font(.caption)
.foregroundStyle(CardsTheme.mutedForeground) .foregroundStyle(CardsTheme.mutedForeground)
.lineLimit(2) .lineLimit(2)
} }
HStack(spacing: 12) { }
Spacer(minLength: 0)
VStack(alignment: .leading, spacing: 6) {
HStack(spacing: 8) {
Label("\(entry.cardCount)", systemImage: "rectangle.stack") Label("\(entry.cardCount)", systemImage: "rectangle.stack")
Label("\(entry.starCount)", systemImage: "star")
if entry.isPaid {
Label("\(entry.priceCredits) Credits", systemImage: "creditcard")
.foregroundStyle(CardsTheme.primary)
}
}
.font(.caption2) .font(.caption2)
.foregroundStyle(CardsTheme.mutedForeground) .foregroundStyle(CardsTheme.mutedForeground)
Label("\(entry.starCount)", systemImage: "star.fill")
.font(.caption2)
.foregroundStyle(CardsTheme.warning)
if entry.isPaid {
Label("\(entry.priceCredits)", systemImage: "creditcard")
.font(.caption2.weight(.semibold))
.foregroundStyle(CardsTheme.primary)
}
Spacer()
}
HStack(spacing: 4) { HStack(spacing: 4) {
Text(entry.owner.displayName) Text(entry.owner.displayName)
.font(.caption2) .font(.caption2)
.foregroundStyle(CardsTheme.mutedForeground) .foregroundStyle(CardsTheme.mutedForeground)
.lineLimit(1)
if entry.owner.verifiedMana { if entry.owner.verifiedMana {
Image(systemName: "checkmark.seal.fill") Image(systemName: "checkmark.seal.fill")
.font(.caption2) .font(.caption2)
@ -169,12 +199,16 @@ struct PublicDeckCard: View {
} }
} }
} }
.padding(12) }
.frame(width: 260, alignment: .leading) .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
.background(CardsTheme.surface, in: RoundedRectangle(cornerRadius: 10)) }
.overlay(
RoundedRectangle(cornerRadius: 10) private var categorySymbol: String {
.stroke(CardsTheme.border, lineWidth: 1) guard let category = entry.category,
) let parsed = DeckCategory(rawValue: category)
else {
return "rectangle.stack"
}
return parsed.systemImageName
} }
} }

View file

@ -55,7 +55,7 @@ targets:
path: Sources/Resources/Info.plist path: Sources/Resources/Info.plist
properties: properties:
CFBundleShortVersionString: "0.1.0" CFBundleShortVersionString: "0.1.0"
CFBundleVersion: "10" CFBundleVersion: "11"
CFBundleDevelopmentRegion: de CFBundleDevelopmentRegion: de
CFBundleDisplayName: Cardecky CFBundleDisplayName: Cardecky
LSApplicationCategoryType: "public.app-category.education" LSApplicationCategoryType: "public.app-category.education"
@ -111,7 +111,7 @@ targets:
properties: properties:
CFBundleDisplayName: Als Karte speichern CFBundleDisplayName: Als Karte speichern
CFBundleShortVersionString: "0.1.0" CFBundleShortVersionString: "0.1.0"
CFBundleVersion: "10" CFBundleVersion: "11"
NSExtension: NSExtension:
NSExtensionPointIdentifier: com.apple.share-services NSExtensionPointIdentifier: com.apple.share-services
NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).ShareViewController NSExtensionPrincipalClass: $(PRODUCT_MODULE_NAME).ShareViewController
@ -144,7 +144,7 @@ targets:
properties: properties:
CFBundleDisplayName: Cardecky Widget CFBundleDisplayName: Cardecky Widget
CFBundleShortVersionString: "0.1.0" CFBundleShortVersionString: "0.1.0"
CFBundleVersion: "10" CFBundleVersion: "11"
NSExtension: NSExtension:
NSExtensionPointIdentifier: com.apple.widgetkit-extension NSExtensionPointIdentifier: com.apple.widgetkit-extension
entitlements: entitlements: