Signed-off-by: Matt Bruce <mbrucedogs@gmail.com>
This commit is contained in:
parent
d35d0bccfc
commit
23b9c90871
@ -27,21 +27,20 @@ struct RitualFocusCardView: View {
|
|||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack(alignment: .leading, spacing: Design.Spacing.medium) {
|
VStack(alignment: .leading, spacing: Design.Spacing.medium) {
|
||||||
HStack(spacing: Design.Spacing.medium) {
|
HStack(spacing: Design.Spacing.small) {
|
||||||
|
// Icon
|
||||||
Image(systemName: iconName)
|
Image(systemName: iconName)
|
||||||
.font(.title2)
|
|
||||||
.foregroundStyle(AppAccent.primary)
|
.foregroundStyle(AppAccent.primary)
|
||||||
.accessibilityHidden(true)
|
.accessibilityHidden(true)
|
||||||
VStack(alignment: .leading, spacing: Design.Spacing.xxxSmall) {
|
|
||||||
Text(title)
|
// Title
|
||||||
.font(.title3)
|
Text(title)
|
||||||
.foregroundStyle(AppTextColors.primary)
|
.font(.headline)
|
||||||
.bold()
|
.foregroundStyle(AppTextColors.primary)
|
||||||
Text(theme)
|
|
||||||
.font(.subheadline)
|
|
||||||
.foregroundStyle(AppTextColors.secondary)
|
|
||||||
}
|
|
||||||
Spacer(minLength: Design.Spacing.medium)
|
Spacer(minLength: Design.Spacing.medium)
|
||||||
|
|
||||||
|
// Day label
|
||||||
Text(dayLabel)
|
Text(dayLabel)
|
||||||
.font(.caption)
|
.font(.caption)
|
||||||
.foregroundStyle(AppTextColors.secondary)
|
.foregroundStyle(AppTextColors.secondary)
|
||||||
@ -52,6 +51,10 @@ struct RitualFocusCardView: View {
|
|||||||
.accessibilityLabel(Text(dayLabel))
|
.accessibilityLabel(Text(dayLabel))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Text(theme)
|
||||||
|
.font(.subheadline)
|
||||||
|
.foregroundStyle(AppTextColors.secondary)
|
||||||
|
|
||||||
VStack(alignment: .leading, spacing: Design.Spacing.xSmall) {
|
VStack(alignment: .leading, spacing: Design.Spacing.xSmall) {
|
||||||
ProgressView(value: progress)
|
ProgressView(value: progress)
|
||||||
.tint(AppAccent.primary)
|
.tint(AppAccent.primary)
|
||||||
|
|||||||
@ -26,19 +26,19 @@ struct TodayHabitRowView: View {
|
|||||||
Button(action: action) {
|
Button(action: action) {
|
||||||
HStack(spacing: Design.Spacing.medium) {
|
HStack(spacing: Design.Spacing.medium) {
|
||||||
Image(systemName: symbolName)
|
Image(systemName: symbolName)
|
||||||
.font(.title3)
|
.font(.body)
|
||||||
.foregroundStyle(isCompleted ? AppStatus.success : AppAccent.primary)
|
.foregroundStyle(isCompleted ? AppStatus.success : AppAccent.primary)
|
||||||
.frame(width: AppMetrics.Size.iconLarge)
|
.frame(width: AppMetrics.Size.iconLarge)
|
||||||
.accessibilityHidden(true)
|
.accessibilityHidden(true)
|
||||||
|
|
||||||
Text(title)
|
Text(title)
|
||||||
.font(.body)
|
.font(.subheadline)
|
||||||
.foregroundStyle(AppTextColors.primary)
|
.foregroundStyle(AppTextColors.primary)
|
||||||
|
|
||||||
Spacer(minLength: Design.Spacing.medium)
|
Spacer(minLength: Design.Spacing.medium)
|
||||||
|
|
||||||
Image(systemName: isCompleted ? "checkmark.circle.fill" : "circle")
|
Image(systemName: isCompleted ? "checkmark.circle.fill" : "circle")
|
||||||
.font(.title3)
|
.font(.body)
|
||||||
.foregroundStyle(isCompleted ? AppStatus.success : AppBorder.subtle)
|
.foregroundStyle(isCompleted ? AppStatus.success : AppBorder.subtle)
|
||||||
.accessibilityHidden(true)
|
.accessibilityHidden(true)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user