skopcaak/Graduately
1
0
Fork 0
mirror of https://github.com/pepaskopec-blip/Graduately.git synced 2026-10-27 15:14:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show macOS statistics as totals and subject rows instead of home-style cards.

Browse source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
pepaskopec-blip 2026-10-03 15:31:52 +02:00
commit 16903b99cb
1 changed files with 87 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

141
ios/Graduately/UI/Screens.swift
View file

@ -468,9 +468,6 @@ struct SettingsScreen: View {
struct StatsScreen: View { struct StatsScreen: View {
@ObservedObject var vm: AppModel @ObservedObject var vm: AppModel
#if os(macOS)
@State private var statsHeader: CGFloat = 160
#endif
var body: some View { var body: some View {
#if os(macOS) #if os(macOS)
@ -547,70 +544,112 @@ struct StatsScreen: View {
private var macStats: some View { private var macStats: some View {
let sum = summarize(vm.content, vm.progress) let sum = summarize(vm.content, vm.progress)
let pct = sum.totalEx == 0 ? 0.0 : Double(sum.doneEx) / Double(sum.totalEx) let pct = sum.totalEx == 0 ? 0.0 : Double(sum.doneEx) / Double(sum.totalEx)
let subjects = vm.content.subjects let ranked = rankedSubjects()
return GeometryReader { geo in return VStack(alignment: .leading, spacing: 22) {
let width = max(geo.size.width - MacChrome.pageInset * 2, 240) HStack(spacing: 16) {
let offered = max(geo.size.height - statsHeader - 20 - MacChrome.pageInset * 2, 150) statMetric(vm.tr("stats_ex_label"), vm.fmt("stats_ex_fmt", sum.doneEx, sum.totalEx))
let minGrid = MacGrid.contentHeight(width: width, height: offered, count: subjects.count, minWidth: 240, minHeight: 150, spacing: 16) statMetric(vm.tr("stats_pct_label"), vm.fmt("stats_pct_fmt", Int(pct * 100)))
let gridH = max(minGrid, geo.size.height - statsHeader - 20 - MacChrome.pageInset * 2) statMetric(vm.tr("stats_units_label"), vm.fmt("stats_units_fmt", sum.doneUnits, sum.openUnits))
ScrollView { }
VStack(alignment: .leading, spacing: 20) { Text(vm.tr("stats_section"))
VStack(alignment: .leading, spacing: 16) { .font(.title2.weight(.semibold))
GlassCard { GeometryReader { geo in
VStack(alignment: .leading, spacing: 14) { let count = max(ranked.count, 1)
HStack(alignment: .top) { let minRow: CGFloat = 54
stat(vm.tr("stats_ex_label"), vm.fmt("stats_ex_fmt", sum.doneEx, sum.totalEx)) let floorH = minRow * CGFloat(ranked.count)
stat(vm.tr("stats_pct_label"), vm.fmt("stats_pct_fmt", Int(pct * 100))) let rowH = min(76, max(minRow, geo.size.height / CGFloat(count)))
stat(vm.tr("stats_units_label"), vm.fmt("stats_units_fmt", sum.doneUnits, sum.openUnits)) let table = VStack(spacing: 0) {
} ForEach(Array(ranked.enumerated()), id: \.offset) { index, item in
ProgressView(value: pct) statRow(item.subject, part: item.part)
} .frame(height: floorH > geo.size.height + 1 ? minRow : rowH)
} if index < ranked.count - 1 {
Text(vm.tr("stats_section")) Divider().padding(.leading, 68)
.font(.title2.weight(.semibold)) }
} }
.background { }
GeometryReader { proxy in .softSurface(cornerRadius: 18)
Color.clear.preference(key: MacHeaderHeight.self, value: proxy.size.height) if floorH > geo.size.height + 1 {
} ScrollView { table }
} } else {
MacFillGrid(count: subjects.count, minWidth: 240, minHeight: 150, spacing: 16, inset: 0) { index in table.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
statSubject(subjects[index]) }
}
.frame(height: gridH)
}
.padding(MacChrome.pageInset)
.frame(maxWidth: .infinity, minHeight: geo.size.height, alignment: .topLeading)
} }
.onPreferenceChange(MacHeaderHeight.self) { statsHeader = $0 }
} }
.padding(MacChrome.pageInset)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
.navigationTitle(vm.tr("stats_title")) .navigationTitle(vm.tr("stats_title"))
} }
private func statSubject(_ s: J) -> some View { private func rankedSubjects() -> [(subject: J, part: ProgressSum)] {
let rows = vm.content.subjects.map { subject in
(subject: subject, part: subjectSum(vm, subject))
}
let open = rows.filter { $0.subject.bool("open") }.sorted { lhs, rhs in
share(lhs.part) > share(rhs.part)
}
let locked = rows.filter { !$0.subject.bool("open") }
return open + locked
}
private func share(_ part: ProgressSum) -> Double {
part.totalEx == 0 ? 0 : Double(part.doneEx) / Double(part.totalEx)
}
private func statMetric(_ label: String, _ value: String) -> some View {
VStack(alignment: .leading, spacing: 6) {
Text(value)
.font(.system(size: 40, weight: .bold, design: .rounded))
.monospacedDigit()
.minimumScaleFactor(0.6)
.lineLimit(1)
Text(label)
.font(.headline)
.foregroundStyle(.secondary)
}
.padding(22)
.frame(maxWidth: .infinity, alignment: .leading)
.softSurface(cornerRadius: 18)
}
private func statRow(_ s: J, part: ProgressSum) -> some View {
let open = s.bool("open") let open = s.bool("open")
let part = subjectSum(vm, s) let progress = share(part)
return VStack(alignment: .leading, spacing: 12) { return HStack(spacing: 16) {
SubjectIcon(icon: s.str("icon"), open: open, size: 36) SubjectIcon(icon: s.str("icon"), open: open, size: 28)
.frame(width: 36)
Text(vm.tr(s.str("key"))) Text(vm.tr(s.str("key")))
.font(.title3.weight(.semibold)) .font(.title3.weight(.semibold))
.foregroundStyle(open ? .primary : .secondary) .foregroundStyle(open ? .primary : .secondary)
Spacer(minLength: 0) .lineLimit(1)
.frame(width: 240, alignment: .leading)
if open && part.totalEx > 0 { if open && part.totalEx > 0 {
ProgressView(value: Double(part.doneEx) / Double(part.totalEx)) statTrack(progress)
Text(vm.fmt("stats_ex_fmt", part.doneEx, part.totalEx)) Text(vm.fmt("stats_ex_fmt", part.doneEx, part.totalEx))
.font(.subheadline) .font(.title3.monospacedDigit())
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
.monospacedDigit() .frame(width: 88, alignment: .trailing)
} else { } else {
statTrack(0)
Text(vm.tr("stats_locked")) Text(vm.tr("stats_locked"))
.font(.subheadline) .font(.body)
.foregroundStyle(.secondary) .foregroundStyle(.tertiary)
.frame(width: 88, alignment: .trailing)
} }
} }
.padding(20) .padding(.horizontal, 18)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading) }
.softSurface(cornerRadius: 22)
private func statTrack(_ progress: Double) -> some View {
GeometryReader { geo in
ZStack(alignment: .leading) {
Capsule().fill(Color.primary.opacity(0.08))
Capsule()
.fill(Color.accentColor)
.frame(width: max(0, geo.size.width * progress))
}
}
.frame(height: 12)
.frame(maxWidth: .infinity)
} }
#endif #endif