feat: move check status below ring, remove checking spinner, re-enable auto-backup
- Move "X sec ago / refresh" row from inside statsStrip to directly below the ring hero so the last-checked time is visible near the status it describes - Remove "Checking status…" spinner from the action button — button shows "Start backup" / "Back up again" at all times - Remove "Checking…" spinner from the ring center (page 0) — ring always shows the pending backup count or "All photos safe" - Re-enable autoBackupEnabled default (true) now that already-safe counting is accurate; auto backup will fire on LAN join when items need backup Co-Authored-By: Kutesir <kutesir@provoc.ug> Co-Authored-By: Sentry <sentry@provoc.ug>
This commit is contained in:
Robin Kutesa
@@ -54,7 +54,12 @@ struct BackupView: View {
|
||||
|
||||
// ─── Ring ─────────────────────────────────────
|
||||
ringHero
|
||||
.padding(.bottom, 44)
|
||||
.padding(.bottom, 12)
|
||||
|
||||
// ─── Check status ─────────────────────────────
|
||||
checkStatusRow
|
||||
.padding(.horizontal, AppTheme.hPad)
|
||||
.padding(.bottom, 20)
|
||||
|
||||
// ─── Stats ────────────────────────────────────
|
||||
statsStrip
|
||||
@@ -229,14 +234,10 @@ struct BackupView: View {
|
||||
private var ringCenterContent: some View {
|
||||
switch ringPage {
|
||||
case 0:
|
||||
// Engine activity always takes priority.
|
||||
// Coordinator states are shown only when the engine is idle.
|
||||
if engine.job.status.isActive {
|
||||
ringMainView
|
||||
} else if coordinator.phase == .disconnected, statusService.snapshot.needBackup > 0 {
|
||||
disconnectedRingView
|
||||
} else if coordinator.phase == .checking {
|
||||
checkingRingView
|
||||
} else {
|
||||
ringMainView
|
||||
}
|
||||
@@ -487,42 +488,43 @@ struct BackupView: View {
|
||||
.clipShape(RoundedRectangle(cornerRadius: 14, style: .continuous))
|
||||
|
||||
pageIndicator
|
||||
|
||||
// Subtle refresh status
|
||||
HStack(spacing: 5) {
|
||||
if statusService.isRefreshing {
|
||||
ProgressView()
|
||||
.scaleEffect(0.5)
|
||||
.tint(AppTheme.inkQuaternary)
|
||||
Text("Checking…")
|
||||
.font(.system(size: 10, weight: .regular))
|
||||
.foregroundStyle(AppTheme.inkQuaternary)
|
||||
} else if let checked = statusService.snapshot.lastCheckedAt {
|
||||
Image(systemName: statusService.snapshot.connectionState == .offline
|
||||
? "wifi.slash" : "checkmark.circle")
|
||||
.font(.system(size: 9, weight: .regular))
|
||||
.foregroundStyle(statusService.snapshot.connectionState == .offline
|
||||
? .orange : AppTheme.inkQuaternary)
|
||||
Text(checked, style: .relative)
|
||||
.font(.system(size: 10, weight: .regular))
|
||||
.foregroundColor(AppTheme.inkQuaternary)
|
||||
+ Text(" ago")
|
||||
.font(.system(size: 10, weight: .regular))
|
||||
.foregroundColor(AppTheme.inkQuaternary)
|
||||
}
|
||||
Spacer()
|
||||
Button {
|
||||
statusService.refresh(force: true)
|
||||
} label: {
|
||||
Image(systemName: "arrow.clockwise")
|
||||
.font(.system(size: 11, weight: .regular))
|
||||
.foregroundStyle(AppTheme.inkQuaternary)
|
||||
}
|
||||
}
|
||||
.frame(height: 16)
|
||||
}
|
||||
}
|
||||
|
||||
private var checkStatusRow: some View {
|
||||
HStack(spacing: 5) {
|
||||
if statusService.isRefreshing {
|
||||
ProgressView()
|
||||
.scaleEffect(0.5)
|
||||
.tint(AppTheme.inkQuaternary)
|
||||
Text("Checking…")
|
||||
.font(.system(size: 10, weight: .regular))
|
||||
.foregroundStyle(AppTheme.inkQuaternary)
|
||||
} else if let checked = statusService.snapshot.lastCheckedAt {
|
||||
Image(systemName: statusService.snapshot.connectionState == .offline
|
||||
? "wifi.slash" : "checkmark.circle")
|
||||
.font(.system(size: 9, weight: .regular))
|
||||
.foregroundStyle(statusService.snapshot.connectionState == .offline
|
||||
? .orange : AppTheme.inkQuaternary)
|
||||
Text(checked, style: .relative)
|
||||
.font(.system(size: 10, weight: .regular))
|
||||
.foregroundColor(AppTheme.inkQuaternary)
|
||||
+ Text(" ago")
|
||||
.font(.system(size: 10, weight: .regular))
|
||||
.foregroundColor(AppTheme.inkQuaternary)
|
||||
}
|
||||
Spacer()
|
||||
Button {
|
||||
statusService.refresh(force: true)
|
||||
} label: {
|
||||
Image(systemName: "arrow.clockwise")
|
||||
.font(.system(size: 11, weight: .regular))
|
||||
.foregroundStyle(AppTheme.inkQuaternary)
|
||||
}
|
||||
}
|
||||
.frame(height: 16)
|
||||
}
|
||||
|
||||
private func compactStat(_ value: String, label: String, color: Color) -> some View {
|
||||
VStack(spacing: 2) {
|
||||
Text(value)
|
||||
@@ -701,56 +703,43 @@ struct BackupView: View {
|
||||
|
||||
private var actionButton: some View {
|
||||
Group {
|
||||
// Coordinator is running a status check — block the start button so
|
||||
// a backup cannot be triggered before reconciliation completes.
|
||||
if coordinator.phase == .checking {
|
||||
switch resolvedStatus {
|
||||
case .idle, .completed, .failed, .cancelled:
|
||||
Button(action: startBackup) {
|
||||
Text(resolvedStatus == .idle ? "Start backup" : "Back up again")
|
||||
}
|
||||
.buttonStyle(PrimaryButtonStyle(
|
||||
color: ctaFlashGreen ? AppTheme.positive : AppTheme.ink
|
||||
))
|
||||
.accessibilityHint("Starts backing up your photos to the NAS")
|
||||
|
||||
case .running:
|
||||
Button { engine.pause() } label: { Text("Pause") }
|
||||
.buttonStyle(GhostButtonStyle())
|
||||
.accessibilityLabel("Pause backup")
|
||||
|
||||
case .paused:
|
||||
HStack(spacing: 10) {
|
||||
Button { engine.resume() } label: { Text("Resume") }
|
||||
.buttonStyle(PrimaryButtonStyle())
|
||||
.accessibilityLabel("Resume backup")
|
||||
Button { engine.cancel() } label: { Text("Cancel") }
|
||||
.buttonStyle(GhostButtonStyle())
|
||||
.frame(width: 90)
|
||||
.accessibilityLabel("Cancel backup")
|
||||
}
|
||||
|
||||
case .preparing:
|
||||
HStack(spacing: 8) {
|
||||
ProgressView().scaleEffect(0.8).tint(AppTheme.inkSecondary)
|
||||
Text("Checking status…")
|
||||
Text("Preparing…")
|
||||
.font(AppTheme.body())
|
||||
.foregroundStyle(AppTheme.inkSecondary)
|
||||
}
|
||||
.frame(height: 50)
|
||||
} else {
|
||||
switch resolvedStatus {
|
||||
case .idle, .completed, .failed, .cancelled:
|
||||
Button(action: startBackup) {
|
||||
Text(resolvedStatus == .idle ? "Start backup" : "Back up again")
|
||||
}
|
||||
.buttonStyle(PrimaryButtonStyle(
|
||||
color: ctaFlashGreen ? AppTheme.positive : AppTheme.ink
|
||||
))
|
||||
.accessibilityHint("Starts backing up your photos to the NAS")
|
||||
|
||||
case .running:
|
||||
Button { engine.pause() } label: { Text("Pause") }
|
||||
.buttonStyle(GhostButtonStyle())
|
||||
.accessibilityLabel("Pause backup")
|
||||
|
||||
case .paused:
|
||||
HStack(spacing: 10) {
|
||||
Button { engine.resume() } label: { Text("Resume") }
|
||||
.buttonStyle(PrimaryButtonStyle())
|
||||
.accessibilityLabel("Resume backup")
|
||||
Button { engine.cancel() } label: { Text("Cancel") }
|
||||
.buttonStyle(GhostButtonStyle())
|
||||
.frame(width: 90)
|
||||
.accessibilityLabel("Cancel backup")
|
||||
}
|
||||
|
||||
case .preparing:
|
||||
HStack(spacing: 8) {
|
||||
ProgressView().scaleEffect(0.8).tint(AppTheme.inkSecondary)
|
||||
Text("Preparing…")
|
||||
.font(AppTheme.body())
|
||||
.foregroundStyle(AppTheme.inkSecondary)
|
||||
}
|
||||
.frame(height: 50)
|
||||
}
|
||||
}
|
||||
}
|
||||
.animation(.spring(response: 0.3, dampingFraction: 0.82), value: engine.job.status == .running)
|
||||
.animation(.spring(response: 0.3, dampingFraction: 0.82), value: coordinator.phase == .checking)
|
||||
}
|
||||
|
||||
private func startBackup() {
|
||||
|
||||
Reference in New Issue
Block a user