diff --git a/KisaniCal/Views/CalendarView.swift b/KisaniCal/Views/CalendarView.swift index 59a3f0e..6006bbe 100644 --- a/KisaniCal/Views/CalendarView.swift +++ b/KisaniCal/Views/CalendarView.swift @@ -648,9 +648,9 @@ struct CalendarView: View { } ForEach(dayTasks) { task in HStack(spacing: 12) { - RoundedRectangle(cornerRadius: 3) + RoundedRectangle(cornerRadius: 5, style: .continuous) .strokeBorder(task.quadrant.color, lineWidth: 1.5) - .frame(width: 18, height: 18) + .frame(width: 16, height: 16) Text(task.title).font(AppFonts.sans(13)).foregroundColor(AppColors.text(cs)) Spacer() if let d = task.dueDate { @@ -1865,7 +1865,7 @@ private struct DayTLRow: View { var onWorkoutTap: (() -> Void)? var onToggle: (() -> Void)? - private let circleD: CGFloat = 18 + private let circleD: CGFloat = 16 private let timeW: CGFloat = 46 private let trackW: CGFloat = 26 private let topGap: CGFloat = 10 @@ -1873,7 +1873,7 @@ private struct DayTLRow: View { @ViewBuilder private var marker: some View { ZStack { if entry.isComplete { - Circle() + RoundedRectangle(cornerRadius: 5, style: .continuous) .fill(entry.color.opacity(0.14)) .frame(width: circleD, height: circleD) Image(systemName: "checkmark") @@ -1887,7 +1887,7 @@ private struct DayTLRow: View { .font(.system(size: 8)) .foregroundColor(AppColors.blue) } else if entry.isAllDay { - Circle() + RoundedRectangle(cornerRadius: 5, style: .continuous) .strokeBorder(entry.color, lineWidth: 1.5) .frame(width: circleD, height: circleD) } else { @@ -1995,18 +1995,18 @@ private struct CalTaskRow: View { HStack(spacing: 12) { Button(action: onToggle) { ZStack { - RoundedRectangle(cornerRadius: 6) + RoundedRectangle(cornerRadius: 5, style: .continuous) .fill(task.isComplete ? AppColors.surface3(cs) : Color.clear) - .frame(width: 22, height: 22) - RoundedRectangle(cornerRadius: 6) + .frame(width: 16, height: 16) + RoundedRectangle(cornerRadius: 5, style: .continuous) .strokeBorder( task.isComplete ? Color.clear : task.quadrant.color, lineWidth: 1.5 ) - .frame(width: 22, height: 22) + .frame(width: 16, height: 16) if task.isComplete { Image(systemName: "checkmark") - .font(.system(size: 10, weight: .bold)) + .font(.system(size: 9, weight: .bold)) .foregroundColor(AppColors.text3(cs)) } } diff --git a/KisaniCal/Views/MatrixView.swift b/KisaniCal/Views/MatrixView.swift index fc62fa1..7174230 100644 --- a/KisaniCal/Views/MatrixView.swift +++ b/KisaniCal/Views/MatrixView.swift @@ -647,13 +647,13 @@ private struct QDTaskRow: View { var body: some View { HStack(spacing: 12) { Button(action: onToggle) { - RoundedRectangle(cornerRadius: 5) + RoundedRectangle(cornerRadius: 5, style: .continuous) .stroke(task.isComplete ? quadrant.color.opacity(0.3) : quadrant.color, lineWidth: 1.5) - .frame(width: 22, height: 22) + .frame(width: 16, height: 16) .overlay { if task.isComplete { Image(systemName: "checkmark") - .font(.system(size: 9, weight: .bold)) + .font(.system(size: 8, weight: .bold)) .foregroundColor(quadrant.color.opacity(0.5)) } }