diff --git a/Andromida/App/Views/Today/Components/RitualFocusCardView.swift b/Andromida/App/Views/Today/Components/RitualFocusCardView.swift index 8c11673..6dd329c 100644 --- a/Andromida/App/Views/Today/Components/RitualFocusCardView.swift +++ b/Andromida/App/Views/Today/Components/RitualFocusCardView.swift @@ -27,21 +27,20 @@ struct RitualFocusCardView: View { var body: some View { VStack(alignment: .leading, spacing: Design.Spacing.medium) { - HStack(spacing: Design.Spacing.medium) { + HStack(spacing: Design.Spacing.small) { + // Icon Image(systemName: iconName) - .font(.title2) .foregroundStyle(AppAccent.primary) .accessibilityHidden(true) - VStack(alignment: .leading, spacing: Design.Spacing.xxxSmall) { - Text(title) - .font(.title3) - .foregroundStyle(AppTextColors.primary) - .bold() - Text(theme) - .font(.subheadline) - .foregroundStyle(AppTextColors.secondary) - } + + // Title + Text(title) + .font(.headline) + .foregroundStyle(AppTextColors.primary) + Spacer(minLength: Design.Spacing.medium) + + // Day label Text(dayLabel) .font(.caption) .foregroundStyle(AppTextColors.secondary) @@ -51,6 +50,10 @@ struct RitualFocusCardView: View { .clipShape(.rect(cornerRadius: Design.CornerRadius.medium)) .accessibilityLabel(Text(dayLabel)) } + + Text(theme) + .font(.subheadline) + .foregroundStyle(AppTextColors.secondary) VStack(alignment: .leading, spacing: Design.Spacing.xSmall) { ProgressView(value: progress) diff --git a/Andromida/App/Views/Today/Components/TodayHabitRowView.swift b/Andromida/App/Views/Today/Components/TodayHabitRowView.swift index 27eab80..c47e72a 100644 --- a/Andromida/App/Views/Today/Components/TodayHabitRowView.swift +++ b/Andromida/App/Views/Today/Components/TodayHabitRowView.swift @@ -26,19 +26,19 @@ struct TodayHabitRowView: View { Button(action: action) { HStack(spacing: Design.Spacing.medium) { Image(systemName: symbolName) - .font(.title3) + .font(.body) .foregroundStyle(isCompleted ? AppStatus.success : AppAccent.primary) .frame(width: AppMetrics.Size.iconLarge) .accessibilityHidden(true) Text(title) - .font(.body) + .font(.subheadline) .foregroundStyle(AppTextColors.primary) Spacer(minLength: Design.Spacing.medium) Image(systemName: isCompleted ? "checkmark.circle.fill" : "circle") - .font(.title3) + .font(.body) .foregroundStyle(isCompleted ? AppStatus.success : AppBorder.subtle) .accessibilityHidden(true) }