Enlarge logos, tricodes, and inline scores on iPhone rows
Game and series rows now lead with a 40pt logo + title3-monospaced tricode + bold inline score + tricode + logo, so the matchup fills the row's vertical space and reads at a glance. For future games the score is replaced by an "@" separator. Right-side metadata (game number, status, kickoff time) stays at subheadline/caption2 so it's secondary. Tricodes and scores get .lineLimit(1).fixedSize() to keep everything on one line on tighter widths.
This commit is contained in:
@@ -10,25 +10,17 @@ import SwiftUI
|
||||
struct SeriesRow: View {
|
||||
let item: MainService.RoundSeriesItem
|
||||
|
||||
private static let logoSize: CGFloat = 40
|
||||
|
||||
var body: some View {
|
||||
Button(action: open) {
|
||||
HStack(alignment: .center, spacing: 10) {
|
||||
matchupBlock
|
||||
Spacer(minLength: 8)
|
||||
VStack(alignment: .trailing, spacing: 2) {
|
||||
Text(statusText)
|
||||
.font(.caption)
|
||||
.fontWeight(.medium)
|
||||
.foregroundStyle(.secondary)
|
||||
if let trailing = trailingText {
|
||||
Text(trailing)
|
||||
.font(.caption2)
|
||||
.foregroundStyle(.tertiary)
|
||||
}
|
||||
}
|
||||
rightContent
|
||||
}
|
||||
.padding(.horizontal, 14)
|
||||
.padding(.vertical, 10)
|
||||
.padding(.vertical, 8)
|
||||
.contentShape(Rectangle())
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
@@ -37,35 +29,52 @@ struct SeriesRow: View {
|
||||
private var matchupBlock: some View {
|
||||
let bottom = item.series.bottomSeedTeam?.abbrev ?? "TBD"
|
||||
let top = item.series.topSeedTeam?.abbrev ?? "TBD"
|
||||
return VStack(alignment: .leading, spacing: 4) {
|
||||
HStack(spacing: 6) {
|
||||
TeamLogo(abbrev: bottom)
|
||||
Text(bottom)
|
||||
.font(.body.monospaced())
|
||||
.fontWeight(.medium)
|
||||
.foregroundStyle(.primary)
|
||||
Text("@")
|
||||
.font(.subheadline)
|
||||
.foregroundStyle(.tertiary)
|
||||
TeamLogo(abbrev: top)
|
||||
Text(top)
|
||||
.font(.body.monospaced())
|
||||
.fontWeight(.medium)
|
||||
.foregroundStyle(.primary)
|
||||
}
|
||||
Text(scoreText)
|
||||
.font(.caption.monospacedDigit())
|
||||
.foregroundStyle(.secondary)
|
||||
return HStack(spacing: 6) {
|
||||
TeamLogo(abbrev: bottom, size: Self.logoSize)
|
||||
Text(bottom)
|
||||
.font(.title3.monospaced())
|
||||
.fontWeight(.semibold)
|
||||
.foregroundStyle(.primary)
|
||||
.lineLimit(1)
|
||||
.fixedSize()
|
||||
Text(seriesScore)
|
||||
.font(.title3.monospacedDigit())
|
||||
.fontWeight(.bold)
|
||||
.foregroundStyle(.primary)
|
||||
.lineLimit(1)
|
||||
.fixedSize()
|
||||
.padding(.horizontal, 2)
|
||||
Text(top)
|
||||
.font(.title3.monospaced())
|
||||
.fontWeight(.semibold)
|
||||
.foregroundStyle(.primary)
|
||||
.lineLimit(1)
|
||||
.fixedSize()
|
||||
TeamLogo(abbrev: top, size: Self.logoSize)
|
||||
}
|
||||
}
|
||||
|
||||
private var scoreText: String {
|
||||
"\(item.series.bottomSeedWins) – \(item.series.topSeedWins)"
|
||||
private var rightContent: some View {
|
||||
VStack(alignment: .trailing, spacing: 2) {
|
||||
Text(statusText)
|
||||
.font(.subheadline)
|
||||
.fontWeight(.medium)
|
||||
.foregroundStyle(.secondary)
|
||||
if let trailing = trailingText {
|
||||
Text(trailing)
|
||||
.font(.caption2)
|
||||
.foregroundStyle(.tertiary)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var seriesScore: String {
|
||||
"\(item.series.bottomSeedWins)–\(item.series.topSeedWins)"
|
||||
}
|
||||
|
||||
private var statusText: String {
|
||||
if let winner = item.series.winner {
|
||||
return "Final · \(winner) wins"
|
||||
return "\(winner) wins"
|
||||
}
|
||||
if let n = item.series.nextGameNumber {
|
||||
return "Game \(n)"
|
||||
@@ -74,7 +83,7 @@ struct SeriesRow: View {
|
||||
}
|
||||
|
||||
private var trailingText: String? {
|
||||
guard item.series.winner == nil else { return nil }
|
||||
guard item.series.winner == nil else { return "Final" }
|
||||
return item.nextGame?.nextGameLabel
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user