From 4fbefd86fbea8fe737c32dd1ee4be5795f4ed43b Mon Sep 17 00:00:00 2001 From: Trey t Date: Sat, 20 Dec 2025 00:59:23 -0600 Subject: [PATCH] Fix HealthKit sync progress layout overlapping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed ZStack to VStack so progress indicator appears below the toggle row instead of overlapping it. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- .claude/settings.local.json | 4 +++- Shared/Views/SettingsView/SettingsView.swift | 18 ++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 2c1573f..ccd4c73 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -13,7 +13,9 @@ "Bash(npx claude-plugins:*)", "Bash(cloc:*)", "Bash(swift -parse:*)", - "Bash(swiftc:*)" + "Bash(swiftc:*)", + "Bash(git add:*)", + "Bash(git commit:*)" ] } } diff --git a/Shared/Views/SettingsView/SettingsView.swift b/Shared/Views/SettingsView/SettingsView.swift index a95fb43..840d11c 100644 --- a/Shared/Views/SettingsView/SettingsView.swift +++ b/Shared/Views/SettingsView/SettingsView.swift @@ -208,8 +208,7 @@ struct SettingsContentView: View { // MARK: - Health Kit Toggle private var healthKitToggle: some View { - ZStack { - theme.currentTheme.secondaryBGColor + VStack(spacing: 0) { HStack(spacing: 12) { Image(systemName: "heart.fill") .font(.title2) @@ -264,7 +263,7 @@ struct SettingsContentView: View { // Show sync progress if HealthKitManager.shared.isSyncing { - VStack(spacing: 8) { + VStack(spacing: 4) { ProgressView(value: HealthKitManager.shared.syncProgress) .tint(.red) Text("Syncing moods to Health... \(HealthKitManager.shared.syncedCount)/\(HealthKitManager.shared.totalToSync)") @@ -272,10 +271,10 @@ struct SettingsContentView: View { .foregroundStyle(.secondary) } .padding(.horizontal) - .padding(.bottom, 8) + .padding(.bottom, 12) } } - .fixedSize(horizontal: false, vertical: true) + .background(theme.currentTheme.secondaryBGColor) .cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight]) .healthKitSyncTip() } @@ -693,8 +692,7 @@ struct SettingsView: View { // MARK: - Health Kit Toggle private var healthKitToggle: some View { - ZStack { - theme.currentTheme.secondaryBGColor + VStack(spacing: 0) { HStack(spacing: 12) { Image(systemName: "heart.fill") .font(.title2) @@ -749,7 +747,7 @@ struct SettingsView: View { // Show sync progress if HealthKitManager.shared.isSyncing { - VStack(spacing: 8) { + VStack(spacing: 4) { ProgressView(value: HealthKitManager.shared.syncProgress) .tint(.red) Text("Syncing moods to Health... \(HealthKitManager.shared.syncedCount)/\(HealthKitManager.shared.totalToSync)") @@ -757,10 +755,10 @@ struct SettingsView: View { .foregroundStyle(.secondary) } .padding(.horizontal) - .padding(.bottom, 8) + .padding(.bottom, 12) } } - .fixedSize(horizontal: false, vertical: true) + .background(theme.currentTheme.secondaryBGColor) .cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight]) }