kutesir/KisaniCal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge develop -> main: full session (KC-51 through KC-71) #28

Merged
kutesir merged 64 commits from develop into main 2026-07-12 22:57:14 +00:00
Conversation 0 Commits 64 Files Changed 47 +9 -1
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f9852751da - Show all commits

8
KisaniCal/ISSUES.md
View File

@@ -2221,3 +2221,11 @@ Files: `KisaniCal/Views/WorkoutView.swift`.
### Note ### Note
Not build-verified (no iOS runtime here). Self-reviewed: balanced braces/ Not build-verified (no iOS runtime here). Self-reviewed: balanced braces/
parens confirmed for the file. parens confirmed for the file.
### Follow-up — Finish-at-100% confirmation reverted
User pushed back on the "confirm every Finish tap" part: at 100% sets,
tapping "Finish Workout" going through a confirmation dialog was
unwanted friction, not a fix — restored the KC-52 behavior where Finish
skips the dialog only when `done == total` (nothing to override at that
point). Partial-completion "Finish Anyway" still confirms. The
always-visible progress dots from this issue's first change are untouched.

2
KisaniCal/Views/WorkoutView.swift
View File

@@ -740,7 +740,7 @@ struct DotProgressCard: View {
private var actionRow: some View { private var actionRow: some View {
VStack(spacing: 8) { VStack(spacing: 8) {
Button { Button {
pendingAction = .finish if done == total && total > 0 { onFinish() } else { pendingAction = .finish }
} label: { } label: {
Label(done == total && total > 0 ? "Finish Workout" : "Finish Anyway", Label(done == total && total > 0 ? "Finish Workout" : "Finish Anyway",
systemImage: "checkmark.circle.fill") systemImage: "checkmark.circle.fill")