atridad/Ascently
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 81 Activity

iOS 2.4.0 - Colour accents and theming

Browse Source
This commit is contained in:
Atridad Lahiji
2025-12-02 15:55:48 -07:00
parent 57855b8332
commit c8694eacab
22 changed files with 468 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
ios/Ascently/Views/AddEdit/AddAttemptView.swift
View File

@@ -5,6 +5,7 @@ struct AddAttemptView: View {
let session: ClimbSession
let gym: Gym
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@Environment(\.dismiss) private var dismiss
@State private var selectedProblem: Problem?
@@ -158,6 +159,7 @@ struct AddAttemptView: View {
showingCreateProblem = true
}
.buttonStyle(.borderedProminent)
.tint(themeManager.accentColor)
}
.padding(.vertical, 8)
} else {
@@ -179,7 +181,7 @@ struct AddAttemptView: View {
Button("Create New Problem") {
showingCreateProblem = true
}
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
}
@@ -198,7 +200,7 @@ struct AddAttemptView: View {
selectedPhotos = []
imageData = []
}
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
@@ -213,7 +215,7 @@ struct AddAttemptView: View {
Spacer()
if selectedClimbType == climbType {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)
@@ -238,7 +240,7 @@ struct AddAttemptView: View {
Spacer()
if selectedDifficultySystem == system {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)
@@ -272,7 +274,7 @@ struct AddAttemptView: View {
}
.buttonStyle(.bordered)
.controlSize(.small)
.tint(newProblemGrade == grade ? .blue : .gray)
.tint(newProblemGrade == grade ? themeManager.accentColor : .gray)
}
}
.padding(.horizontal, 1)
@@ -287,12 +289,12 @@ struct AddAttemptView: View {
}) {
HStack {
Image(systemName: "camera.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
.font(.title2)
VStack(alignment: .leading, spacing: 2) {
Text("Add Photos")
.font(.headline)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text("\(imageData.count) of 5 photos added")
.font(.caption)
.foregroundColor(.secondary)
@@ -353,7 +355,7 @@ struct AddAttemptView: View {
Spacer()
if selectedResult == result {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)
@@ -529,6 +531,7 @@ struct ProblemSelectionRow: View {
let problem: Problem
let isSelected: Bool
let action: () -> Void
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
HStack {
@@ -539,7 +542,7 @@ struct ProblemSelectionRow: View {
Text("\(problem.difficulty.system.displayName): \(problem.difficulty.grade)")
.font(.subheadline)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
if let location = problem.location {
Text(location)
@@ -552,7 +555,7 @@ struct ProblemSelectionRow: View {
if isSelected {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)
@@ -569,6 +572,7 @@ struct ProblemSelectionCard: View {
let isSelected: Bool
let action: () -> Void
@State private var showingExpandedView = false
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
VStack(spacing: 8) {
@@ -594,7 +598,7 @@ struct ProblemSelectionCard: View {
if isSelected {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.white)
.background(Circle().fill(.blue))
.background(Circle().fill(themeManager.accentColor))
.font(.title3)
}
}
@@ -634,7 +638,7 @@ struct ProblemSelectionCard: View {
Text(problem.difficulty.grade)
.font(.caption2)
.fontWeight(.bold)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
if let location = problem.location {
Text(location)
@@ -648,8 +652,8 @@ struct ProblemSelectionCard: View {
.padding(8)
.background(
RoundedRectangle(cornerRadius: 12)
.fill(isSelected ? .blue.opacity(0.1) : .gray.opacity(0.05))
.stroke(isSelected ? .blue : .clear, lineWidth: 2)
.fill(isSelected ? themeManager.accentColor.opacity(0.1) : .gray.opacity(0.05))
.stroke(isSelected ? themeManager.accentColor : .clear, lineWidth: 2)
)
.contentShape(Rectangle())
.onTapGesture {
@@ -668,6 +672,7 @@ struct ProblemSelectionCard: View {
struct ProblemExpandedView: View {
let problem: Problem
@Environment(\.dismiss) private var dismiss
@EnvironmentObject var themeManager: ThemeManager
@State private var selectedImageIndex = 0
var body: some View {
@@ -696,7 +701,7 @@ struct ProblemExpandedView: View {
Text(problem.difficulty.grade)
.font(.title3)
.fontWeight(.bold)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text(problem.climbType.displayName)
.font(.subheadline)
@@ -724,9 +729,9 @@ struct ProblemExpandedView: View {
.padding(.vertical, 4)
.background(
RoundedRectangle(cornerRadius: 8)
.fill(.blue.opacity(0.1))
.fill(themeManager.accentColor.opacity(0.1))
)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
.padding(.horizontal)
@@ -752,6 +757,7 @@ struct ProblemExpandedView: View {
struct EditAttemptView: View {
let attempt: Attempt
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@Environment(\.dismiss) private var dismiss
@State private var selectedProblem: Problem?
@@ -926,6 +932,7 @@ struct EditAttemptView: View {
showingCreateProblem = true
}
.buttonStyle(.borderedProminent)
.tint(themeManager.accentColor)
}
.padding(.vertical, 8)
} else {
@@ -947,7 +954,7 @@ struct EditAttemptView: View {
Button("Create New Problem") {
showingCreateProblem = true
}
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
}
@@ -966,7 +973,7 @@ struct EditAttemptView: View {
selectedPhotos = []
imageData = []
}
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
@@ -981,7 +988,7 @@ struct EditAttemptView: View {
Spacer()
if selectedClimbType == climbType {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)
@@ -1006,7 +1013,7 @@ struct EditAttemptView: View {
Spacer()
if selectedDifficultySystem == system {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)
@@ -1040,7 +1047,7 @@ struct EditAttemptView: View {
}
.buttonStyle(.bordered)
.controlSize(.small)
.tint(newProblemGrade == grade ? .blue : .gray)
.tint(newProblemGrade == grade ? themeManager.accentColor : .gray)
}
}
.padding(.horizontal, 1)
@@ -1055,12 +1062,12 @@ struct EditAttemptView: View {
}) {
HStack {
Image(systemName: "camera.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
.font(.title2)
VStack(alignment: .leading, spacing: 2) {
Text("Add Photos")
.font(.headline)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text("\(imageData.count) of 5 photos added")
.font(.caption)
.foregroundColor(.secondary)
@@ -1121,7 +1128,7 @@ struct EditAttemptView: View {
Spacer()
if selectedResult == result {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)

5
ios/Ascently/Views/AddEdit/AddEditGymView.swift
View File

@@ -3,6 +3,7 @@ import SwiftUI
struct AddEditGymView: View {
let gymId: UUID?
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@Environment(\.dismiss) private var dismiss
@State private var name = ""
@@ -83,7 +84,7 @@ struct AddEditGymView: View {
Spacer()
if selectedClimbTypes.contains(climbType) {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)
@@ -115,7 +116,7 @@ struct AddEditGymView: View {
Spacer()
if selectedDifficultySystems.contains(system) {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)

13
ios/Ascently/Views/AddEdit/AddEditProblemView.swift
View File

@@ -5,6 +5,7 @@ struct AddEditProblemView: View {
let problemId: UUID?
let gymId: UUID?
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@Environment(\.dismiss) private var dismiss
@State private var selectedGym: Gym?
@@ -192,7 +193,7 @@ struct AddEditProblemView: View {
if selectedGym?.id == gym.id {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
.contentShape(Rectangle())
@@ -235,7 +236,7 @@ struct AddEditProblemView: View {
Spacer()
if selectedClimbType == climbType {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)
@@ -264,7 +265,7 @@ struct AddEditProblemView: View {
Spacer()
if selectedDifficultySystem == system {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
} else {
Image(systemName: "circle")
.foregroundColor(.gray)
@@ -337,7 +338,7 @@ struct AddEditProblemView: View {
} else {
Text("Selected: \(difficultyGrade)")
.font(.caption)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
}
@@ -372,12 +373,12 @@ struct AddEditProblemView: View {
}) {
HStack {
Image(systemName: "camera.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
.font(.title2)
VStack(alignment: .leading, spacing: 2) {
Text("Add Photos")
.font(.headline)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text("\(imageData.count) of 5 photos added")
.font(.caption)
.foregroundColor(.secondary)

3
ios/Ascently/Views/AddEdit/AddEditSessionView.swift
View File

@@ -3,6 +3,7 @@ import SwiftUI
struct AddEditSessionView: View {
let sessionId: UUID?
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@Environment(\.dismiss) private var dismiss
@State private var selectedGym: Gym?
@@ -71,7 +72,7 @@ struct AddEditSessionView: View {
if selectedGym?.id == gym.id {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
.contentShape(Rectangle())

40
ios/Ascently/Views/AnalyticsView.swift
View File

@@ -2,6 +2,7 @@ import SwiftUI
struct AnalyticsView: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
NavigationStack {
@@ -25,7 +26,7 @@ struct AnalyticsView: View {
if dataManager.isSyncing {
HStack(spacing: 2) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .blue))
.progressViewStyle(CircularProgressViewStyle(tint: themeManager.accentColor))
.scaleEffect(0.6)
}
.padding(.horizontal, 6)
@@ -47,6 +48,7 @@ struct AnalyticsView: View {
struct OverallStatsSection: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
VStack(alignment: .leading, spacing: 16) {
@@ -59,7 +61,7 @@ struct OverallStatsSection: View {
title: "Sessions",
value: "\(dataManager.completedSessions().count)",
icon: "play.fill",
color: .blue
color: themeManager.accentColor
)
StatCard(
@@ -117,13 +119,15 @@ struct StatCard: View {
.padding()
.background(
RoundedRectangle(cornerRadius: 12)
.fill(.ultraThinMaterial)
.fill(Color(uiColor: .secondarySystemGroupedBackground))
.shadow(color: .black.opacity(0.05), radius: 2, x: 0, y: 1)
)
}
}
struct ProgressChartSection: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@State private var selectedSystem: DifficultySystem = .vScale
@State private var showAllTime: Bool = true
@State private var cachedGradeCountData: [GradeCount] = []
@@ -178,10 +182,10 @@ struct ProgressChartSection: View {
.padding(.vertical, 4)
.background(
RoundedRectangle(cornerRadius: 6)
.fill(showAllTime ? .blue : .clear)
.stroke(.blue.opacity(0.3), lineWidth: 1)
.fill(showAllTime ? themeManager.accentColor : .clear)
.stroke(themeManager.accentColor.opacity(0.3), lineWidth: 1)
)
.foregroundColor(showAllTime ? .white : .blue)
.foregroundColor(showAllTime ? themeManager.contrastingTextColor : themeManager.accentColor)
}
Button(action: {
@@ -194,10 +198,10 @@ struct ProgressChartSection: View {
.padding(.vertical, 4)
.background(
RoundedRectangle(cornerRadius: 6)
.fill(!showAllTime ? .blue : .clear)
.stroke(.blue.opacity(0.3), lineWidth: 1)
.fill(!showAllTime ? themeManager.accentColor : .clear)
.stroke(themeManager.accentColor.opacity(0.3), lineWidth: 1)
)
.foregroundColor(!showAllTime ? .white : .blue)
.foregroundColor(!showAllTime ? themeManager.contrastingTextColor : themeManager.accentColor)
}
}
@@ -215,7 +219,7 @@ struct ProgressChartSection: View {
if selectedSystem == system {
Spacer()
Image(systemName: "checkmark")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
}
@@ -232,10 +236,10 @@ struct ProgressChartSection: View {
.padding(.vertical, 6)
.background(
RoundedRectangle(cornerRadius: 8)
.fill(.blue.opacity(0.1))
.stroke(.blue.opacity(0.3), lineWidth: 1)
.fill(themeManager.accentColor.opacity(0.1))
.stroke(themeManager.accentColor.opacity(0.3), lineWidth: 1)
)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
}
@@ -336,6 +340,7 @@ struct GradeCount {
struct BarChartView: View {
let data: [GradeCount]
@EnvironmentObject var themeManager: ThemeManager
private var sortedData: [GradeCount] {
data.sorted { $0.gradeNumeric < $1.gradeNumeric }
@@ -367,7 +372,7 @@ struct BarChartView: View {
VStack(spacing: 4) {
// Bar
RoundedRectangle(cornerRadius: 4)
.fill(.blue)
.fill(themeManager.accentColor)
.frame(
width: barWidth,
height: CGFloat(gradeCount.count) / CGFloat(maxCount)
@@ -377,7 +382,7 @@ struct BarChartView: View {
Text("\(gradeCount.count)")
.font(.caption2)
.fontWeight(.medium)
.foregroundColor(.white)
.foregroundColor(themeManager.contrastingTextColor)
.opacity(gradeCount.count > 0 ? 1 : 0)
)
@@ -471,6 +476,7 @@ struct FavoriteGymSection: View {
struct RecentActivitySection: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
private var recentSessionsCount: Int {
dataManager.sessions.count
@@ -485,7 +491,7 @@ struct RecentActivitySection: View {
HStack {
Image(systemName: "clock.fill")
.font(.title2)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text("Recent Activity")
.font(.title2)
@@ -499,7 +505,7 @@ struct RecentActivitySection: View {
HStack {
Image(systemName: "play.circle")
.font(.subheadline)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text("\(recentSessionsCount) sessions")
.font(.subheadline)

20
ios/Ascently/Views/CalendarView.swift
View File

@@ -2,6 +2,7 @@ import SwiftUI
struct CalendarView: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
let sessions: [ClimbSession]
@Binding var selectedMonth: Date
@Binding var selectedDate: Date?
@@ -68,7 +69,7 @@ struct CalendarView: View {
Image(systemName: "chevron.left")
.font(.title2)
.fontWeight(.semibold)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
.frame(width: 44, height: 44)
@@ -84,7 +85,7 @@ struct CalendarView: View {
Image(systemName: "chevron.right")
.font(.title2)
.fontWeight(.semibold)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
.frame(width: 44, height: 44)
}
@@ -97,10 +98,10 @@ struct CalendarView: View {
Text("Today")
.font(.subheadline)
.fontWeight(.semibold)
.foregroundColor(.white)
.foregroundColor(themeManager.contrastingTextColor)
.padding(.horizontal, 20)
.padding(.vertical, 8)
.background(Color.blue)
.background(themeManager.accentColor)
.clipShape(Capsule())
}
}
@@ -209,6 +210,7 @@ struct CalendarDayCell: View {
let isToday: Bool
let isInCurrentMonth: Bool
let onTap: () -> Void
@EnvironmentObject var themeManager: ThemeManager
var dayNumber: String {
let formatter = DateFormatter()
@@ -224,9 +226,9 @@ struct CalendarDayCell: View {
.fontWeight(sessions.isEmpty ? .regular : .medium)
.foregroundColor(
isSelected
? .white
? themeManager.contrastingTextColor
: isToday
? .blue
? themeManager.accentColor
: !isInCurrentMonth
? .secondary.opacity(0.3)
: sessions.isEmpty ? .secondary : .primary
@@ -234,7 +236,7 @@ struct CalendarDayCell: View {
if !sessions.isEmpty {
Circle()
.fill(isSelected ? .white : .blue)
.fill(isSelected ? themeManager.contrastingTextColor : themeManager.accentColor)
.frame(width: 4, height: 4)
} else {
Spacer()
@@ -247,13 +249,13 @@ struct CalendarDayCell: View {
.background(
RoundedRectangle(cornerRadius: 6)
.fill(
isSelected ? Color.blue : isToday ? Color.blue.opacity(0.1) : Color.clear
isSelected ? themeManager.accentColor : isToday ? themeManager.accentColor.opacity(0.1) : Color.clear
)
)
.overlay(
RoundedRectangle(cornerRadius: 6)
.stroke(
isToday && !isSelected ? Color.blue.opacity(0.3) : Color.clear, lineWidth: 1
isToday && !isSelected ? themeManager.accentColor.opacity(0.3) : Color.clear, lineWidth: 1
)
)
}

14
ios/Ascently/Views/Detail/GymDetailView.swift
View File

@@ -3,6 +3,7 @@ import SwiftUI
struct GymDetailView: View {
let gymId: UUID
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@Environment(\.dismiss) private var dismiss
@State private var showingDeleteAlert = false
@@ -108,6 +109,7 @@ struct GymDetailView: View {
struct GymHeaderCard: View {
let gym: Gym
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
VStack(alignment: .leading, spacing: 16) {
@@ -145,9 +147,9 @@ struct GymHeaderCard: View {
.padding(.vertical, 6)
.background(
RoundedRectangle(cornerRadius: 12)
.fill(.blue.opacity(0.1))
.fill(themeManager.accentColor.opacity(0.1))
)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
.padding(.horizontal, 1)
@@ -318,8 +320,8 @@ struct ProblemRowCard: View {
.padding()
.background(
RoundedRectangle(cornerRadius: 12)
.fill(.ultraThinMaterial)
.stroke(.quaternary, lineWidth: 1)
.fill(Color(uiColor: .secondarySystemGroupedBackground))
.shadow(color: .black.opacity(0.05), radius: 2, x: 0, y: 1)
)
}
}
@@ -371,8 +373,8 @@ struct SessionRowCard: View {
.padding()
.background(
RoundedRectangle(cornerRadius: 12)
.fill(.ultraThinMaterial)
.stroke(.quaternary, lineWidth: 1)
.fill(Color(uiColor: .secondarySystemGroupedBackground))
.shadow(color: .black.opacity(0.05), radius: 2, x: 0, y: 1)
)
}

14
ios/Ascently/Views/Detail/ProblemDetailView.swift
View File

@@ -3,6 +3,7 @@ import SwiftUI
struct ProblemDetailView: View {
let problemId: UUID
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@Environment(\.dismiss) private var dismiss
@State private var showingDeleteAlert = false
@State private var showingImageViewer = false
@@ -125,6 +126,7 @@ struct ProblemDetailView: View {
struct ProblemHeaderCard: View {
let problem: Problem
let gym: Gym
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
VStack(alignment: .leading, spacing: 16) {
@@ -151,7 +153,7 @@ struct ProblemHeaderCard: View {
Text(problem.difficulty.grade)
.font(.title)
.fontWeight(.bold)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text(problem.climbType.displayName)
.font(.subheadline)
@@ -178,9 +180,9 @@ struct ProblemHeaderCard: View {
.padding(.vertical, 4)
.background(
RoundedRectangle(cornerRadius: 8)
.fill(.blue.opacity(0.1))
.fill(themeManager.accentColor.opacity(0.1))
)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
.padding(.horizontal, 1)
@@ -223,6 +225,7 @@ struct ProgressSummaryCard: View {
let totalAttempts: Int
let successfulAttempts: Int
let firstSuccess: (date: Date, result: AttemptResult)?
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
VStack(alignment: .leading, spacing: 16) {
@@ -251,7 +254,7 @@ struct ProgressSummaryCard: View {
"\(formatDate(firstSuccess.date)) (\(firstSuccess.result.displayName))"
)
.font(.subheadline)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
.padding(.top, 8)
}
@@ -396,7 +399,8 @@ struct AttemptHistoryCard: View {
.padding()
.background(
RoundedRectangle(cornerRadius: 12)
.fill(.ultraThinMaterial)
.fill(Color(uiColor: .secondarySystemGroupedBackground))
.shadow(color: .black.opacity(0.05), radius: 2, x: 0, y: 1)
)
}

197
ios/Ascently/Views/Detail/SessionDetailView.swift
View File

@@ -4,6 +4,7 @@ import SwiftUI
struct SessionDetailView: View {
let sessionId: UUID
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@Environment(\.dismiss) private var dismiss
@State private var showingDeleteAlert = false
@State private var showingAddAttempt = false
@@ -35,26 +36,91 @@ struct SessionDetailView: View {
}
var body: some View {
ScrollView {
LazyVStack(spacing: 20) {
if let session = session, let gym = gym {
List {
if let session = session, let gym = gym {
Section {
SessionHeaderCard(
session: session, gym: gym, stats: sessionStats)
.listRowInsets(EdgeInsets())
.listRowBackground(Color.clear)
.listRowSeparator(.hidden)
.padding(.bottom, 8)
SessionStatsCard(stats: sessionStats)
AttemptsSection(
attemptsWithProblems: attemptsWithProblems,
attemptToDelete: $attemptToDelete,
editingAttempt: $editingAttempt)
} else {
Text("Session not found")
.foregroundColor(.secondary)
.listRowInsets(EdgeInsets())
.listRowBackground(Color.clear)
.listRowSeparator(.hidden)
}
}
.padding()
}
Section {
if attemptsWithProblems.isEmpty {
VStack(spacing: 12) {
Image(systemName: "hand.raised.slash")
.font(.title)
.foregroundColor(.secondary)
Text("No attempts yet")
.font(.headline)
.foregroundColor(.secondary)
Text("Start attempting problems to see your progress!")
.font(.subheadline)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
}
.frame(maxWidth: .infinity)
.padding()
.background(
RoundedRectangle(cornerRadius: 16)
.fill(.regularMaterial)
)
.listRowBackground(Color.clear)
.listRowSeparator(.hidden)
} else {
ForEach(attemptsWithProblems.indices, id: \.self) { index in
let (attempt, problem) = attemptsWithProblems[index]
AttemptCard(attempt: attempt, problem: problem)
.listRowBackground(Color.clear)
.listRowSeparator(.hidden)
.listRowInsets(EdgeInsets(top: 6, leading: 16, bottom: 6, trailing: 16))
.swipeActions(edge: .trailing, allowsFullSwipe: true) {
Button(role: .destructive) {
let impactFeedback = UIImpactFeedbackGenerator(style: .medium)
impactFeedback.impactOccurred()
attemptToDelete = attempt
} label: {
Label("Delete", systemImage: "trash")
}
.accessibilityLabel("Delete attempt")
Button {
editingAttempt = attempt
} label: {
Label("Edit", systemImage: "pencil")
}
.tint(themeManager.accentColor)
.accessibilityLabel("Edit attempt")
}
.onTapGesture {
editingAttempt = attempt
}
}
}
} header: {
Text("Attempts (\(attemptsWithProblems.count))")
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.primary)
.textCase(nil)
.padding(.bottom, 8)
.padding(.top, 16)
}
} else {
Text("Session not found")
.foregroundColor(.secondary)
}
}
.listStyle(.plain)
.navigationTitle("Session Details")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
@@ -112,9 +178,9 @@ struct SessionDetailView: View {
Button(action: { showingAddAttempt = true }) {
Image(systemName: "plus")
.font(.title2)
.foregroundColor(.white)
.foregroundColor(.white) // Keep white for contrast on colored button
.frame(width: 56, height: 56)
.background(Circle().fill(.blue))
.background(Circle().fill(themeManager.accentColor))
.shadow(radius: 4)
}
.padding()
@@ -162,6 +228,7 @@ struct SessionHeaderCard: View {
let session: ClimbSession
let gym: Gym
let stats: SessionStats
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
VStack(alignment: .leading, spacing: 16) {
@@ -172,7 +239,7 @@ struct SessionHeaderCard: View {
Text(formatDate(session.date))
.font(.title2)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
if session.status == .active {
if let startTime = session.startTime {
@@ -200,12 +267,12 @@ struct SessionHeaderCard: View {
// Status indicator
HStack {
Image(systemName: session.status == .active ? "play.fill" : "checkmark.circle.fill")
.foregroundColor(session.status == .active ? .green : .blue)
.foregroundColor(session.status == .active ? .green : themeManager.accentColor)
Text(session.status == .active ? "In Progress" : "Completed")
.font(.subheadline)
.fontWeight(.medium)
.foregroundColor(session.status == .active ? .green : .blue)
.foregroundColor(session.status == .active ? .green : themeManager.accentColor)
Spacer()
}
@@ -213,7 +280,7 @@ struct SessionHeaderCard: View {
.padding(.vertical, 6)
.background(
RoundedRectangle(cornerRadius: 8)
.fill((session.status == .active ? Color.green : Color.blue).opacity(0.1))
.fill((session.status == .active ? Color.green : themeManager.accentColor).opacity(0.1))
)
}
.padding()
@@ -264,13 +331,14 @@ struct SessionStatsCard: View {
struct StatItem: View {
let label: String
let value: String
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
VStack(spacing: 4) {
Text(value)
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text(label)
.font(.caption)
@@ -280,85 +348,12 @@ struct StatItem: View {
}
}
struct AttemptsSection: View {
let attemptsWithProblems: [(Attempt, Problem)]
@Binding var attemptToDelete: Attempt?
@Binding var editingAttempt: Attempt?
@EnvironmentObject var dataManager: ClimbingDataManager
var body: some View {
VStack(alignment: .leading, spacing: 16) {
Text("Attempts (\(attemptsWithProblems.count))")
.font(.title2)
.fontWeight(.bold)
if attemptsWithProblems.isEmpty {
VStack(spacing: 12) {
Image(systemName: "hand.raised.slash")
.font(.title)
.foregroundColor(.secondary)
Text("No attempts yet")
.font(.headline)
.foregroundColor(.secondary)
Text("Start attempting problems to see your progress!")
.font(.subheadline)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
}
.frame(maxWidth: .infinity)
.padding()
.background(
RoundedRectangle(cornerRadius: 16)
.fill(.regularMaterial)
)
} else {
List {
ForEach(attemptsWithProblems.indices, id: \.self) { index in
let (attempt, problem) = attemptsWithProblems[index]
AttemptCard(attempt: attempt, problem: problem)
.listRowBackground(Color.clear)
.listRowSeparator(.hidden)
.listRowInsets(EdgeInsets(top: 6, leading: 0, bottom: 6, trailing: 0))
.swipeActions(edge: .trailing, allowsFullSwipe: true) {
Button(role: .destructive) {
// Add haptic feedback for delete action
let impactFeedback = UIImpactFeedbackGenerator(style: .medium)
impactFeedback.impactOccurred()
attemptToDelete = attempt
} label: {
Label("Delete", systemImage: "trash")
}
.accessibilityLabel("Delete attempt")
.accessibilityHint("Removes this attempt from the session")
Button {
editingAttempt = attempt
} label: {
Label("Edit", systemImage: "pencil")
}
.tint(.blue)
.accessibilityLabel("Edit attempt")
.accessibilityHint("Modify the details of this attempt")
}
.onTapGesture {
editingAttempt = attempt
}
}
}
.listStyle(.plain)
.scrollDisabled(true)
.frame(height: CGFloat(attemptsWithProblems.count) * 120)
}
}
}
}
// AttemptsSection removed as it is now integrated into the main List
struct AttemptCard: View {
let attempt: Attempt
let problem: Problem
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
VStack(alignment: .leading, spacing: 12) {
@@ -370,7 +365,7 @@ struct AttemptCard: View {
Text("\(problem.difficulty.system.displayName): \(problem.difficulty.grade)")
.font(.subheadline)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
if let location = problem.location {
Text(location)
@@ -399,9 +394,11 @@ struct AttemptCard: View {
}
}
.padding()
.background(.regularMaterial)
.cornerRadius(12)
.shadow(radius: 2)
.background(
RoundedRectangle(cornerRadius: 12)
.fill(Color(uiColor: .secondarySystemGroupedBackground)) // Better contrast in light mode
.shadow(color: .black.opacity(0.05), radius: 2, x: 0, y: 1)
)
}
}

11
ios/Ascently/Views/GymsView.swift
View File

@@ -2,6 +2,7 @@ import SwiftUI
struct GymsView: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@State private var showingAddGym = false
var body: some View {
@@ -19,7 +20,7 @@ struct GymsView: View {
if dataManager.isSyncing {
HStack(spacing: 2) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .blue))
.progressViewStyle(CircularProgressViewStyle(tint: themeManager.accentColor))
.scaleEffect(0.6)
}
.padding(.horizontal, 6)
@@ -48,6 +49,7 @@ struct GymsView: View {
struct GymsList: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@State private var gymToDelete: Gym?
@State private var gymToEdit: Gym?
@@ -71,7 +73,7 @@ struct GymsList: View {
Text("Edit")
}
}
.tint(.blue)
.tint(themeManager.accentColor)
}
}
.alert("Delete Gym", isPresented: .constant(gymToDelete != nil)) {
@@ -98,6 +100,7 @@ struct GymsList: View {
struct GymRow: View {
let gym: Gym
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
private var problemCount: Int {
dataManager.problems(forGym: gym.id).count
@@ -133,9 +136,9 @@ struct GymRow: View {
.padding(.vertical, 4)
.background(
RoundedRectangle(cornerRadius: 8)
.fill(.blue.opacity(0.1))
.fill(themeManager.accentColor.opacity(0.1))
)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
}

25
ios/Ascently/Views/ProblemsView.swift
View File

@@ -2,6 +2,7 @@ import SwiftUI
struct ProblemsView: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@State private var showingAddProblem = false
@State private var selectedClimbType: ClimbType?
@State private var selectedGym: Gym?
@@ -134,7 +135,7 @@ struct ProblemsView: View {
if dataManager.isSyncing {
HStack(spacing: 2) {
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .blue))
.progressViewStyle(CircularProgressViewStyle(tint: themeManager.accentColor))
.scaleEffect(0.6)
}
.padding(.horizontal, 6)
@@ -162,7 +163,7 @@ struct ProblemsView: View {
}) {
Image(systemName: showingSearch ? "xmark.circle.fill" : "magnifyingglass")
.font(.system(size: 16, weight: .medium))
.foregroundColor(showingSearch ? .secondary : .blue)
.foregroundColor(showingSearch ? .secondary : themeManager.accentColor)
}
if !dataManager.gyms.isEmpty {
@@ -196,6 +197,7 @@ struct ProblemsView: View {
struct FilterSection: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@Binding var selectedClimbType: ClimbType?
@Binding var selectedGym: Gym?
let filteredProblems: [Problem]
@@ -278,6 +280,7 @@ struct FilterChip: View {
let title: String
let isSelected: Bool
let action: () -> Void
@EnvironmentObject var themeManager: ThemeManager
var body: some View {
Button(action: action) {
@@ -288,10 +291,10 @@ struct FilterChip: View {
.padding(.vertical, 6)
.background(
RoundedRectangle(cornerRadius: 16)
.fill(isSelected ? .blue : .clear)
.stroke(.blue, lineWidth: 1)
.fill(isSelected ? themeManager.accentColor : .clear)
.stroke(themeManager.accentColor, lineWidth: 1)
)
.foregroundColor(isSelected ? .white : .blue)
.foregroundColor(isSelected ? themeManager.contrastingTextColor : themeManager.accentColor)
}
.buttonStyle(.plain)
}
@@ -300,6 +303,7 @@ struct FilterChip: View {
struct ProblemsList: View {
let problems: [Problem]
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@State private var problemToDelete: Problem?
@State private var problemToEdit: Problem?
@State private var animationKey = 0
@@ -337,7 +341,7 @@ struct ProblemsList: View {
Text("Edit")
}
}
.tint(.blue)
.tint(themeManager.accentColor)
}
}
.animation(
@@ -375,6 +379,7 @@ struct ProblemsList: View {
struct ProblemRow: View {
let problem: Problem
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
private var gym: Gym? {
dataManager.gym(withId: problem.gymId)
@@ -407,7 +412,7 @@ struct ProblemRow: View {
if !problem.imagePaths.isEmpty {
Image(systemName: "photo")
.font(.system(size: 14, weight: .medium))
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
if isCompleted {
@@ -419,7 +424,7 @@ struct ProblemRow: View {
Text(problem.difficulty.grade)
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
Text(problem.climbType.displayName)
@@ -444,9 +449,9 @@ struct ProblemRow: View {
.padding(.vertical, 2)
.background(
RoundedRectangle(cornerRadius: 4)
.fill(.blue.opacity(0.1))
.fill(themeManager.accentColor.opacity(0.1))
)
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
}
}
}

103
ios/Ascently/Views/SettingsView.swift
View File

@@ -9,6 +9,7 @@ enum SheetType {
struct SettingsView: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@State private var activeSheet: SheetType?
var body: some View {
@@ -20,6 +21,8 @@ struct SettingsView: View {
HealthKitSection()
.environmentObject(dataManager.healthKitService)
AppearanceSection()
DataManagementSection(
activeSheet: $activeSheet
)
@@ -75,8 +78,90 @@ extension SheetType: Identifiable {
}
}
struct AppearanceSection: View {
@EnvironmentObject var themeManager: ThemeManager
let columns = [
GridItem(.adaptive(minimum: 44))
]
var body: some View {
Section("Appearance") {
VStack(alignment: .leading, spacing: 12) {
Text("Accent Color")
.font(.caption)
.foregroundColor(.secondary)
.textCase(.uppercase)
LazyVGrid(columns: columns, spacing: 12) {
ForEach(ThemeManager.presetColors, id: \.self) { color in
Circle()
.fill(color)
.frame(width: 44, height: 44)
.overlay(
ZStack {
if isSelected(color) {
Image(systemName: "checkmark")
.font(.headline)
.foregroundColor(.white)
.shadow(radius: 1)
}
}
)
.onTapGesture {
withAnimation {
themeManager.accentColor = color
}
}
.accessibilityLabel(colorDescription(for: color))
.accessibilityAddTraits(isSelected(color) ? .isSelected : [])
}
}
.padding(.vertical, 8)
}
if !isSelected(.blue) {
Button("Reset to Default") {
withAnimation {
themeManager.resetToDefault()
}
}
.foregroundColor(.red)
}
}
}
private func isSelected(_ color: Color) -> Bool {
// Compare using UIColor to handle different Color initializers
let selectedUIColor = UIColor(themeManager.accentColor)
let targetUIColor = UIColor(color)
// Simple equality check might fail for some system colors, so we check components if needed
// But usually UIColor equality is robust enough for system colors
return selectedUIColor == targetUIColor
}
private func colorDescription(for color: Color) -> String {
switch color {
case .blue: return "Blue"
case .purple: return "Purple"
case .pink: return "Pink"
case .red: return "Red"
case .orange: return "Orange"
case .green: return "Green"
case .teal: return "Teal"
case .indigo: return "Indigo"
case .mint: return "Mint"
case Color(uiColor: .systemBrown): return "Brown"
case Color(uiColor: .systemCyan): return "Cyan"
default: return "Color"
}
}
}
struct DataManagementSection: View {
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@Binding var activeSheet: SheetType?
@State private var showingResetAlert = false
@State private var isExporting = false
@@ -100,7 +185,7 @@ struct DataManagementSection: View {
.foregroundColor(.secondary)
} else {
Image(systemName: "square.and.arrow.up")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text("Export Data")
}
Spacer()
@@ -253,6 +338,7 @@ struct DataManagementSection: View {
}
struct AppInfoSection: View {
@EnvironmentObject var themeManager: ThemeManager
private var appVersion: String {
Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown"
}
@@ -265,7 +351,7 @@ struct AppInfoSection: View {
Section("App Information") {
HStack {
Image(systemName: "info.circle")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text("Version")
Spacer()
Text("\(appVersion) (\(buildNumber))")
@@ -278,6 +364,7 @@ struct AppInfoSection: View {
struct ExportDataView: View {
let data: Data
@Environment(\.dismiss) private var dismiss
@EnvironmentObject var themeManager: ThemeManager
@State private var tempFileURL: URL?
@State private var isCreatingFile = true
@@ -291,7 +378,7 @@ struct ExportDataView: View {
VStack(spacing: 20) {
ProgressView()
.scaleEffect(1.5)
.tint(.blue)
.tint(themeManager.accentColor)
Text("Preparing Your Export")
.font(.title2)
@@ -330,12 +417,12 @@ struct ExportDataView: View {
) {
Label("Share Data", systemImage: "square.and.arrow.up")
.font(.headline)
.foregroundColor(.white)
.foregroundColor(themeManager.contrastingTextColor)
.frame(maxWidth: .infinity)
.padding()
.background(
RoundedRectangle(cornerRadius: 12)
.fill(.blue)
.fill(themeManager.accentColor)
)
}
.padding(.horizontal)
@@ -430,6 +517,7 @@ struct ExportDataView: View {
struct SyncSection: View {
@EnvironmentObject var syncService: SyncService
@EnvironmentObject var dataManager: ClimbingDataManager
@EnvironmentObject var themeManager: ThemeManager
@State private var showingSyncSettings = false
@State private var showingDisconnectAlert = false
@@ -475,7 +563,7 @@ struct SyncSection: View {
}) {
HStack {
Image(systemName: "gear")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text("Configure Server")
Spacer()
Image(systemName: "chevron.right")
@@ -594,6 +682,7 @@ struct SyncSection: View {
struct SyncSettingsView: View {
@EnvironmentObject var syncService: SyncService
@EnvironmentObject var themeManager: ThemeManager
@Environment(\.dismiss) private var dismiss
@State private var serverURL: String = ""
@State private var authToken: String = ""
@@ -644,7 +733,7 @@ struct SyncSettingsView: View {
.foregroundColor(.secondary)
} else {
Image(systemName: "network")
.foregroundColor(.blue)
.foregroundColor(themeManager.accentColor)
Text("Test Connection")
Spacer()
if syncService.isConnected {