[iOS & Android] iOS 1.3.0 & Android 1.8.0

ios/OpenClimb/Components/CameraImagePicker.swift

@@ -0,0 +1,54 @@
+import SwiftUI
+import UIKit
+
+struct CameraImagePicker: UIViewControllerRepresentable {
+    @Binding var isPresented: Bool
+    let onImageCaptured: (UIImage) -> Void
+
+    func makeUIViewController(context: Context) -> UIImagePickerController {
+        let picker = UIImagePickerController()
+        picker.delegate = context.coordinator
+        picker.sourceType = .camera
+        picker.cameraCaptureMode = .photo
+        picker.cameraDevice = .rear
+        picker.allowsEditing = false
+        return picker
+    }
+
+    func updateUIViewController(_ uiViewController: UIImagePickerController, context: Context) {
+        // Nothing here actually... Q_Q
+    }
+
+    func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+
+    class Coordinator: NSObject, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
+        let parent: CameraImagePicker
+
+        init(_ parent: CameraImagePicker) {
+            self.parent = parent
+        }
+
+        func imagePickerController(
+            _ picker: UIImagePickerController,
+            didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]
+        ) {
+            if let image = info[.originalImage] as? UIImage {
+                parent.onImageCaptured(image)
+            }
+            parent.isPresented = false
+        }
+
+        func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
+            parent.isPresented = false
+        }
+    }
+}
+
+// Extension to check camera availability
+extension CameraImagePicker {
+    static var isCameraAvailable: Bool {
+        UIImagePickerController.isSourceTypeAvailable(.camera)
+    }
+}

ios/OpenClimb/Components/PhotoOptionSheet.swift

@@ -0,0 +1,83 @@
+import PhotosUI
+import SwiftUI
+
+struct PhotoOptionSheet: View {
+    @Binding var selectedPhotos: [PhotosPickerItem]
+    @Binding var imageData: [Data]
+    let maxImages: Int
+    let onCameraSelected: () -> Void
+    let onPhotoLibrarySelected: () -> Void
+    let onDismiss: () -> Void
+
+    var body: some View {
+        NavigationView {
+            VStack(spacing: 20) {
+                Text("Add Photo")
+                    .font(.title2)
+                    .fontWeight(.semibold)
+                    .padding(.top)
+
+                Text("Choose how you'd like to add a photo")
+                    .font(.subheadline)
+                    .foregroundColor(.secondary)
+
+                VStack(spacing: 16) {
+                    Button(action: {
+                        onPhotoLibrarySelected()
+                        onDismiss()
+                    }) {
+                        HStack {
+                            Image(systemName: "photo.on.rectangle")
+                                .font(.title2)
+                                .foregroundColor(.blue)
+                            Text("Photo Library")
+                                .font(.headline)
+                            Spacer()
+                            Image(systemName: "chevron.right")
+                                .font(.caption)
+                                .foregroundColor(.secondary)
+                        }
+                        .padding()
+                        .background(.regularMaterial)
+                        .cornerRadius(12)
+                    }
+                    .buttonStyle(PlainButtonStyle())
+
+                    Button(action: {
+                        onCameraSelected()
+                        onDismiss()
+                    }) {
+                        HStack {
+                            Image(systemName: "camera.fill")
+                                .font(.title2)
+                                .foregroundColor(.blue)
+                            Text("Camera")
+                                .font(.headline)
+                            Spacer()
+                            Image(systemName: "chevron.right")
+                                .font(.caption)
+                                .foregroundColor(.secondary)
+                        }
+                        .padding()
+                        .background(.regularMaterial)
+                        .cornerRadius(12)
+                    }
+                    .buttonStyle(PlainButtonStyle())
+                }
+                .padding(.horizontal)
+
+                Spacer()
+            }
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button("Cancel") {
+                        onDismiss()
+                    }
+                }
+            }
+        }
+        .presentationDetents([.height(300)])
+        .interactiveDismissDisabled(false)
+    }
+}

ios/OpenClimb/Info.plist

@@ -8,5 +8,7 @@
 	<true/>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>This app needs access to your photo library to add photos to climbing problems.</string>
+	<key>NSCameraUsageDescription</key>
+	<string>This app needs access to your camera to take photos of climbing problems.</string>
 </dict>
 </plist>

ios/OpenClimb/Models/ActivityAttributes.swift

@@ -17,3 +17,4 @@ extension SessionActivityAttributes {
         SessionActivityAttributes(gymName: "Summit Climbing", startTime: Date())
     }
 }
+    

ios/OpenClimb/Services/SyncService.swift

@@ -401,31 +401,35 @@ class SyncService: ObservableObject {
         let imagePathMapping = try await syncImagesFromServer(
             backup: serverBackup, dataManager: dataManager)
 
-        // Merge data additively - never remove existing local data
+        // Merge deletion lists first to prevent resurrection of deleted items
+        let localDeletions = dataManager.getDeletedItems()
+        let allDeletions = localDeletions + serverBackup.deletedItems
+        let uniqueDeletions = Array(Set(allDeletions))
+
         print("Merging gyms...")
         let mergedGyms = mergeGyms(
             local: dataManager.gyms,
             server: serverBackup.gyms,
-            deletedItems: serverBackup.deletedItems)
+            deletedItems: uniqueDeletions)
 
         print("Merging problems...")
         let mergedProblems = try mergeProblems(
             local: dataManager.problems,
             server: serverBackup.problems,
             imagePathMapping: imagePathMapping,
-            deletedItems: serverBackup.deletedItems)
+            deletedItems: uniqueDeletions)
 
         print("Merging sessions...")
         let mergedSessions = try mergeSessions(
             local: dataManager.sessions,
             server: serverBackup.sessions,
-            deletedItems: serverBackup.deletedItems)
+            deletedItems: uniqueDeletions)
 
         print("Merging attempts...")
         let mergedAttempts = try mergeAttempts(
             local: dataManager.attempts,
             server: serverBackup.attempts,
-            deletedItems: serverBackup.deletedItems)
+            deletedItems: uniqueDeletions)
 
         // Update data manager with merged data
         dataManager.gyms = mergedGyms
@@ -440,11 +444,6 @@ class SyncService: ObservableObject {
         dataManager.saveAttempts()
         dataManager.saveActiveSession()
 
-        // Merge deletion lists
-        let localDeletions = dataManager.getDeletedItems()
-        let allDeletions = localDeletions + serverBackup.deletedItems
-        let uniqueDeletions = Array(Set(allDeletions))
-
         // Update local deletions with merged list
         dataManager.clearDeletedItems()
         if let data = try? JSONEncoder().encode(uniqueDeletions) {

ios/OpenClimb/Views/AddEdit/AddAttemptView.swift

@@ -23,6 +23,22 @@ struct AddAttemptView: View {
     @State private var selectedPhotos: [PhotosPickerItem] = []
     @State private var imageData: [Data] = []
 
+    enum SheetType: Identifiable {
+        case photoOptions
+        case camera
+
+        var id: Int {
+            switch self {
+            case .photoOptions: return 0
+            case .camera: return 1
+            }
+        }
+    }
+
+    @State private var activeSheet: SheetType?
+    @State private var showPhotoPicker = false
+    @State private var isPhotoPickerActionPending = false
+
     private var activeProblems: [Problem] {
         dataManager.activeProblems(forGym: gym.id)
     }
@@ -78,6 +94,56 @@ struct AddAttemptView: View {
         .onChange(of: selectedDifficultySystem) {
             resetGradeIfNeeded()
         }
+        .onChange(of: selectedPhotos) {
+            Task {
+                await loadSelectedPhotos()
+            }
+        }
+
+        .photosPicker(
+            isPresented: $showPhotoPicker,
+            selection: $selectedPhotos,
+            maxSelectionCount: 5 - imageData.count,
+            matching: .images
+        )
+        .sheet(
+            item: $activeSheet,
+            onDismiss: {
+                if isPhotoPickerActionPending {
+                    showPhotoPicker = true
+                    isPhotoPickerActionPending = false
+                }
+            }
+        ) { sheetType in
+            switch sheetType {
+            case .photoOptions:
+                PhotoOptionSheet(
+                    selectedPhotos: $selectedPhotos,
+                    imageData: $imageData,
+                    maxImages: 5,
+                    onCameraSelected: {
+                        activeSheet = .camera
+                    },
+                    onPhotoLibrarySelected: {
+                        isPhotoPickerActionPending = true
+                    },
+                    onDismiss: {
+                        activeSheet = nil
+                    }
+                )
+            case .camera:
+                CameraImagePicker(
+                    isPresented: Binding(
+                        get: { activeSheet == .camera },
+                        set: { if !$0 { activeSheet = nil } }
+                    )
+                ) { capturedImage in
+                    if let jpegData = capturedImage.jpegData(compressionQuality: 0.8) {
+                        imageData.append(jpegData)
+                    }
+                }
+            }
+        }
     }
 
     @ViewBuilder
@@ -216,11 +282,9 @@ struct AddAttemptView: View {
         }
 
         Section("Photos (Optional)") {
-            PhotosPicker(
-                selection: $selectedPhotos,
-                maxSelectionCount: 5,
-                matching: .images
-            ) {
+            Button(action: {
+                activeSheet = .photoOptions
+            }) {
                 HStack {
                     Image(systemName: "camera.fill")
                         .foregroundColor(.blue)
@@ -240,11 +304,7 @@ struct AddAttemptView: View {
                 }
                 .padding(.vertical, 4)
             }
-            .onChange(of: selectedPhotos) { _, _ in
-                Task {
-                    await loadSelectedPhotos()
-                }
-            }
+            .disabled(imageData.count >= 5)
 
             if !imageData.isEmpty {
                 ScrollView(.horizontal, showsIndicators: false) {
@@ -378,6 +438,21 @@ struct AddAttemptView: View {
         }
     }
 
+    private func loadSelectedPhotos() async {
+        var newImageData: [Data] = []
+
+        for item in selectedPhotos {
+            if let data = try? await item.loadTransferable(type: Data.self) {
+                newImageData.append(data)
+            }
+        }
+
+        await MainActor.run {
+            imageData.append(contentsOf: newImageData)
+            selectedPhotos.removeAll()
+        }
+    }
+
     private func saveAttempt() {
         if showingCreateProblem {
             let difficulty = DifficultyGrade(
@@ -436,19 +511,6 @@ struct AddAttemptView: View {
         dismiss()
     }
 
-    private func loadSelectedPhotos() async {
-        var newImageData: [Data] = []
-
-        for item in selectedPhotos {
-            if let data = try? await item.loadTransferable(type: Data.self) {
-                newImageData.append(data)
-            }
-        }
-
-        await MainActor.run {
-            imageData = newImageData
-        }
-    }
 }
 
 struct ProblemSelectionRow: View {
@@ -696,6 +758,22 @@ struct EditAttemptView: View {
     @State private var selectedPhotos: [PhotosPickerItem] = []
     @State private var imageData: [Data] = []
 
+    enum SheetType: Identifiable {
+        case photoOptions
+        case camera
+
+        var id: Int {
+            switch self {
+            case .photoOptions: return 0
+            case .camera: return 1
+            }
+        }
+    }
+
+    @State private var activeSheet: SheetType?
+    @State private var showPhotoPicker = false
+    @State private var isPhotoPickerActionPending = false
+
     private var availableProblems: [Problem] {
         guard let session = dataManager.session(withId: attempt.sessionId) else {
             return []
@@ -772,6 +850,56 @@ struct EditAttemptView: View {
         .onChange(of: selectedDifficultySystem) {
             resetGradeIfNeeded()
         }
+        .onChange(of: selectedPhotos) {
+            Task {
+                await loadSelectedPhotos()
+            }
+        }
+
+        .photosPicker(
+            isPresented: $showPhotoPicker,
+            selection: $selectedPhotos,
+            maxSelectionCount: 5 - imageData.count,
+            matching: .images
+        )
+        .sheet(
+            item: $activeSheet,
+            onDismiss: {
+                if isPhotoPickerActionPending {
+                    showPhotoPicker = true
+                    isPhotoPickerActionPending = false
+                }
+            }
+        ) { sheetType in
+            switch sheetType {
+            case .photoOptions:
+                PhotoOptionSheet(
+                    selectedPhotos: $selectedPhotos,
+                    imageData: $imageData,
+                    maxImages: 5,
+                    onCameraSelected: {
+                        activeSheet = .camera
+                    },
+                    onPhotoLibrarySelected: {
+                        isPhotoPickerActionPending = true
+                    },
+                    onDismiss: {
+                        activeSheet = nil
+                    }
+                )
+            case .camera:
+                CameraImagePicker(
+                    isPresented: Binding(
+                        get: { activeSheet == .camera },
+                        set: { if !$0 { activeSheet = nil } }
+                    )
+                ) { capturedImage in
+                    if let jpegData = capturedImage.jpegData(compressionQuality: 0.8) {
+                        imageData.append(jpegData)
+                    }
+                }
+            }
+        }
     }
 
     @ViewBuilder
@@ -910,11 +1038,9 @@ struct EditAttemptView: View {
         }
 
         Section("Photos (Optional)") {
-            PhotosPicker(
-                selection: $selectedPhotos,
-                maxSelectionCount: 5,
-                matching: .images
-            ) {
+            Button(action: {
+                activeSheet = .photoOptions
+            }) {
                 HStack {
                     Image(systemName: "camera.fill")
                         .foregroundColor(.blue)
@@ -934,11 +1060,7 @@ struct EditAttemptView: View {
                 }
                 .padding(.vertical, 4)
             }
-            .onChange(of: selectedPhotos) { _, _ in
-                Task {
-                    await loadSelectedPhotos()
-                }
-            }
+            .disabled(imageData.count >= 5)
 
             if !imageData.isEmpty {
                 ScrollView(.horizontal, showsIndicators: false) {
@@ -1074,6 +1196,21 @@ struct EditAttemptView: View {
         }
     }
 
+    private func loadSelectedPhotos() async {
+        var newImageData: [Data] = []
+
+        for item in selectedPhotos {
+            if let data = try? await item.loadTransferable(type: Data.self) {
+                newImageData.append(data)
+            }
+        }
+
+        await MainActor.run {
+            imageData.append(contentsOf: newImageData)
+            selectedPhotos.removeAll()
+        }
+    }
+
     private func updateAttempt() {
         if showingCreateProblem {
             guard let gym = gym else { return }
@@ -1131,19 +1268,6 @@ struct EditAttemptView: View {
         dismiss()
     }
 
-    private func loadSelectedPhotos() async {
-        var newImageData: [Data] = []
-
-        for item in selectedPhotos {
-            if let data = try? await item.loadTransferable(type: Data.self) {
-                newImageData.append(data)
-            }
-        }
-
-        await MainActor.run {
-            imageData = newImageData
-        }
-    }
 }
 
 #Preview {

ios/OpenClimb/Views/AddEdit/AddEditProblemView.swift

@@ -22,6 +22,21 @@ struct AddEditProblemView: View {
     @State private var selectedPhotos: [PhotosPickerItem] = []
     @State private var imageData: [Data] = []
     @State private var isEditing = false
+    enum SheetType: Identifiable {
+        case photoOptions
+        case camera
+
+        var id: Int {
+            switch self {
+            case .photoOptions: return 0
+            case .camera: return 1
+            }
+        }
+    }
+
+    @State private var activeSheet: SheetType?
+    @State private var showPhotoPicker = false
+    @State private var isPhotoPickerActionPending = false
 
     private var existingProblem: Problem? {
         guard let problemId = problemId else { return nil }
@@ -87,6 +102,12 @@ struct AddEditProblemView: View {
             loadExistingProblem()
             setupInitialGym()
         }
+        .onChange(of: dataManager.gyms) {
+            // Ensure a gym is selected when gyms are loaded or changed
+            if selectedGym == nil && !dataManager.gyms.isEmpty {
+                selectedGym = dataManager.gyms.first
+            }
+        }
         .onChange(of: selectedGym) {
             updateAvailableOptions()
         }
@@ -96,11 +117,56 @@ struct AddEditProblemView: View {
         .onChange(of: selectedDifficultySystem) {
             resetGradeIfNeeded()
         }
+        .sheet(
+            item: $activeSheet,
+            onDismiss: {
+                if isPhotoPickerActionPending {
+                    showPhotoPicker = true
+                    isPhotoPickerActionPending = false
+                }
+            }
+        ) { sheetType in
+            switch sheetType {
+            case .photoOptions:
+                PhotoOptionSheet(
+                    selectedPhotos: $selectedPhotos,
+                    imageData: $imageData,
+                    maxImages: 5,
+                    onCameraSelected: {
+                        activeSheet = .camera
+                    },
+                    onPhotoLibrarySelected: {
+                        isPhotoPickerActionPending = true
+                    },
+                    onDismiss: {
+                        activeSheet = nil
+                    }
+                )
+            case .camera:
+                CameraImagePicker(
+                    isPresented: Binding(
+                        get: { activeSheet == .camera },
+                        set: { if !$0 { activeSheet = nil } }
+                    )
+                ) { capturedImage in
+                    if let jpegData = capturedImage.jpegData(compressionQuality: 0.8) {
+                        imageData.append(jpegData)
+                    }
+                }
+            }
+        }
+        .photosPicker(
+            isPresented: $showPhotoPicker,
+            selection: $selectedPhotos,
+            maxSelectionCount: 5 - imageData.count,
+            matching: .images
+        )
         .onChange(of: selectedPhotos) {
             Task {
                 await loadSelectedPhotos()
             }
         }
+
     }
 
     @ViewBuilder
@@ -302,11 +368,9 @@ struct AddEditProblemView: View {
     @ViewBuilder
     private func PhotosSection() -> some View {
         Section("Photos (Optional)") {
-            PhotosPicker(
-                selection: $selectedPhotos,
-                maxSelectionCount: 5,
-                matching: .images
-            ) {
+            Button(action: {
+                activeSheet = .photoOptions
+            }) {
                 HStack {
                     Image(systemName: "camera.fill")
                         .foregroundColor(.blue)
@@ -326,6 +390,7 @@ struct AddEditProblemView: View {
                 }
                 .padding(.vertical, 4)
             }
+            .disabled(imageData.count >= 5)
 
             if !imageData.isEmpty {
                 ScrollView(.horizontal, showsIndicators: false) {
@@ -398,9 +463,14 @@ struct AddEditProblemView: View {
     }
 
     private func setupInitialGym() {
-        if let gymId = gymId, selectedGym == nil {
+        if let gymId = gymId {
             selectedGym = dataManager.gym(withId: gymId)
         }
+
+        // Always ensure a gym is selected if available and none is currently selected
+        if selectedGym == nil && !dataManager.gyms.isEmpty {
+            selectedGym = dataManager.gyms.first
+        }
     }
 
     private func loadExistingProblem() {
@@ -466,18 +536,14 @@ struct AddEditProblemView: View {
     private func loadSelectedPhotos() async {
         for item in selectedPhotos {
             if let data = try? await item.loadTransferable(type: Data.self) {
-                // Use ImageManager to save image
-                if let relativePath = ImageManager.shared.saveImageData(data) {
-                    imagePaths.append(relativePath)
-                    imageData.append(data)
-                }
+                imageData.append(data)
             }
         }
         selectedPhotos.removeAll()
     }
 
     private func saveProblem() {
-        guard let gym = selectedGym else { return }
+        guard let gym = selectedGym, canSave else { return }
 
         let trimmedName = name.trimmingCharacters(in: .whitespacesAndNewlines)
         let trimmedDescription = description.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -490,6 +556,14 @@ struct AddEditProblemView: View {
 
         let difficulty = DifficultyGrade(system: selectedDifficultySystem, grade: difficultyGrade)
 
+        // Save new image data and combine with existing paths
+        var allImagePaths = imagePaths
+        for data in imageData {
+            if let relativePath = ImageManager.shared.saveImageData(data) {
+                allImagePaths.append(relativePath)
+            }
+        }
+
         if isEditing, let problem = existingProblem {
             let updatedProblem = problem.updated(
                 name: trimmedName.isEmpty ? nil : trimmedName,
@@ -499,7 +573,7 @@ struct AddEditProblemView: View {
 
                 tags: trimmedTags,
                 location: trimmedLocation.isEmpty ? nil : trimmedLocation,
-                imagePaths: imagePaths,
+                imagePaths: allImagePaths,
                 isActive: isActive,
                 dateSet: dateSet,
                 notes: trimmedNotes.isEmpty ? nil : trimmedNotes
@@ -515,7 +589,7 @@ struct AddEditProblemView: View {
 
                 tags: trimmedTags,
                 location: trimmedLocation.isEmpty ? nil : trimmedLocation,
-                imagePaths: imagePaths,
+                imagePaths: allImagePaths,
                 dateSet: dateSet,
                 notes: trimmedNotes.isEmpty ? nil : trimmedNotes
             )