1.6.0 for Android and 1.1.0 for iOS - Finalizing Export and Import

formats :)

android/app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
         applicationId = "com.atridad.openclimb"
         minSdk = 31
         targetSdk = 36
-        versionCode = 24
+        versionCode = 27
-        versionName = "1.5.0"
+        versionName = "1.6.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

android/app/src/main/java/com/atridad/openclimb/data/database/dao/ProblemDao.kt

@@ -11,8 +11,7 @@ interface ProblemDao {
     @Query("SELECT * FROM problems ORDER BY updatedAt DESC")
     fun getAllProblems(): Flow<List<Problem>>
 
-    @Query("SELECT * FROM problems WHERE id = :id")
+    @Query("SELECT * FROM problems WHERE id = :id") suspend fun getProblemById(id: String): Problem?
-    suspend fun getProblemById(id: String): Problem?
 
     @Query("SELECT * FROM problems WHERE gymId = :gymId ORDER BY updatedAt DESC")
     fun getProblemsByGym(gymId: String): Flow<List<Problem>>
@@ -20,7 +19,9 @@ interface ProblemDao {
     @Query("SELECT * FROM problems WHERE climbType = :climbType ORDER BY updatedAt DESC")
     fun getProblemsByClimbType(climbType: ClimbType): Flow<List<Problem>>
 
-    @Query("SELECT * FROM problems WHERE gymId = :gymId AND climbType = :climbType ORDER BY updatedAt DESC")
+    @Query(
+            "SELECT * FROM problems WHERE gymId = :gymId AND climbType = :climbType ORDER BY updatedAt DESC"
+    )
     fun getProblemsByGymAndType(gymId: String, climbType: ClimbType): Flow<List<Problem>>
 
     @Query("SELECT * FROM problems WHERE isActive = 1 ORDER BY updatedAt DESC")
@@ -29,20 +30,16 @@ interface ProblemDao {
     @Query("SELECT * FROM problems WHERE gymId = :gymId AND isActive = 1 ORDER BY updatedAt DESC")
     fun getActiveProblemsByGym(gymId: String): Flow<List<Problem>>
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertProblem(problem: Problem)
-    suspend fun insertProblem(problem: Problem)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertProblems(problems: List<Problem>)
 
-    @Update
+    @Update suspend fun updateProblem(problem: Problem)
-    suspend fun updateProblem(problem: Problem)
 
-    @Delete
+    @Delete suspend fun deleteProblem(problem: Problem)
-    suspend fun deleteProblem(problem: Problem)
 
-    @Query("DELETE FROM problems WHERE id = :id")
+    @Query("DELETE FROM problems WHERE id = :id") suspend fun deleteProblemById(id: String)
-    suspend fun deleteProblemById(id: String)
 
     @Query("SELECT COUNT(*) FROM problems WHERE gymId = :gymId")
     suspend fun getProblemsCountByGym(gymId: String): Int
@@ -50,19 +47,18 @@ interface ProblemDao {
     @Query("SELECT COUNT(*) FROM problems WHERE isActive = 1")
     suspend fun getActiveProblemsCount(): Int
 
-    @Query("""
+    @Query(
+            """
         SELECT * FROM problems
         WHERE (name LIKE '%' || :searchQuery || '%'
         OR description LIKE '%' || :searchQuery || '%'
-        OR location LIKE '%' || :searchQuery || '%'
+        OR location LIKE '%' || :searchQuery || '%')
-        OR setter LIKE '%' || :searchQuery || '%')
         ORDER BY updatedAt DESC
-    """)
+    """
+    )
     fun searchProblems(searchQuery: String): Flow<List<Problem>>
 
-    @Query("SELECT COUNT(*) FROM problems")
+    @Query("SELECT COUNT(*) FROM problems") suspend fun getProblemsCount(): Int
-    suspend fun getProblemsCount(): Int
 
-    @Query("DELETE FROM problems")
+    @Query("DELETE FROM problems") suspend fun deleteAllProblems()
-    suspend fun deleteAllProblems()
 }

android/app/src/main/java/com/atridad/openclimb/data/format/BackupFormat.kt

@@ -0,0 +1,226 @@
+package com.atridad.openclimb.data.format
+
+import com.atridad.openclimb.data.model.*
+import kotlinx.serialization.Serializable
+
+/** Root structure for OpenClimb backup data */
+@Serializable
+data class ClimbDataBackup(
+        val exportedAt: String,
+        val version: String = "2.0",
+        val formatVersion: String = "2.0",
+        val gyms: List<BackupGym>,
+        val problems: List<BackupProblem>,
+        val sessions: List<BackupClimbSession>,
+        val attempts: List<BackupAttempt>
+)
+
+/** Platform-neutral gym representation for backup/restore */
+@Serializable
+data class BackupGym(
+        val id: String,
+        val name: String,
+        val location: String? = null,
+        val supportedClimbTypes: List<ClimbType>,
+        val difficultySystems: List<DifficultySystem>,
+        val customDifficultyGrades: List<String> = emptyList(),
+        val notes: String? = null,
+        val createdAt: String, // ISO 8601 format
+        val updatedAt: String // ISO 8601 format
+) {
+    companion object {
+        /** Create BackupGym from native Android Gym model */
+        fun fromGym(gym: Gym): BackupGym {
+            return BackupGym(
+                    id = gym.id,
+                    name = gym.name,
+                    location = gym.location,
+                    supportedClimbTypes = gym.supportedClimbTypes,
+                    difficultySystems = gym.difficultySystems,
+                    customDifficultyGrades = gym.customDifficultyGrades,
+                    notes = gym.notes,
+                    createdAt = gym.createdAt,
+                    updatedAt = gym.updatedAt
+            )
+        }
+    }
+
+    /** Convert to native Android Gym model */
+    fun toGym(): Gym {
+        return Gym(
+                id = id,
+                name = name,
+                location = location,
+                supportedClimbTypes = supportedClimbTypes,
+                difficultySystems = difficultySystems,
+                customDifficultyGrades = customDifficultyGrades,
+                notes = notes,
+                createdAt = createdAt,
+                updatedAt = updatedAt
+        )
+    }
+}
+
+/** Platform-neutral problem representation for backup/restore */
+@Serializable
+data class BackupProblem(
+        val id: String,
+        val gymId: String,
+        val name: String? = null,
+        val description: String? = null,
+        val climbType: ClimbType,
+        val difficulty: DifficultyGrade,
+        val tags: List<String> = emptyList(),
+        val location: String? = null,
+        val imagePaths: List<String>? = null,
+        val isActive: Boolean = true,
+        val dateSet: String? = null, // ISO 8601 format
+        val notes: String? = null,
+        val createdAt: String, // ISO 8601 format
+        val updatedAt: String // ISO 8601 format
+) {
+    companion object {
+        /** Create BackupProblem from native Android Problem model */
+        fun fromProblem(problem: Problem): BackupProblem {
+            return BackupProblem(
+                    id = problem.id,
+                    gymId = problem.gymId,
+                    name = problem.name,
+                    description = problem.description,
+                    climbType = problem.climbType,
+                    difficulty = problem.difficulty,
+                    tags = problem.tags,
+                    location = problem.location,
+                    imagePaths = problem.imagePaths.ifEmpty { null },
+                    isActive = problem.isActive,
+                    dateSet = problem.dateSet,
+                    notes = problem.notes,
+                    createdAt = problem.createdAt,
+                    updatedAt = problem.updatedAt
+            )
+        }
+    }
+
+    /** Convert to native Android Problem model */
+    fun toProblem(): Problem {
+        return Problem(
+                id = id,
+                gymId = gymId,
+                name = name,
+                description = description,
+                climbType = climbType,
+                difficulty = difficulty,
+                tags = tags,
+                location = location,
+                imagePaths = imagePaths ?: emptyList(),
+                isActive = isActive,
+                dateSet = dateSet,
+                notes = notes,
+                createdAt = createdAt,
+                updatedAt = updatedAt
+        )
+    }
+
+    /** Create a copy with updated image paths for import processing */
+    fun withUpdatedImagePaths(newImagePaths: List<String>): BackupProblem {
+        return copy(imagePaths = newImagePaths.ifEmpty { null })
+    }
+}
+
+/** Platform-neutral climb session representation for backup/restore */
+@Serializable
+data class BackupClimbSession(
+        val id: String,
+        val gymId: String,
+        val date: String, // ISO 8601 format
+        val startTime: String? = null, // ISO 8601 format
+        val endTime: String? = null, // ISO 8601 format
+        val duration: Long? = null, // Duration in seconds
+        val status: SessionStatus,
+        val notes: String? = null,
+        val createdAt: String, // ISO 8601 format
+        val updatedAt: String // ISO 8601 format
+) {
+    companion object {
+        /** Create BackupClimbSession from native Android ClimbSession model */
+        fun fromClimbSession(session: ClimbSession): BackupClimbSession {
+            return BackupClimbSession(
+                    id = session.id,
+                    gymId = session.gymId,
+                    date = session.date,
+                    startTime = session.startTime,
+                    endTime = session.endTime,
+                    duration = session.duration,
+                    status = session.status,
+                    notes = session.notes,
+                    createdAt = session.createdAt,
+                    updatedAt = session.updatedAt
+            )
+        }
+    }
+
+    /** Convert to native Android ClimbSession model */
+    fun toClimbSession(): ClimbSession {
+        return ClimbSession(
+                id = id,
+                gymId = gymId,
+                date = date,
+                startTime = startTime,
+                endTime = endTime,
+                duration = duration,
+                status = status,
+                notes = notes,
+                createdAt = createdAt,
+                updatedAt = updatedAt
+        )
+    }
+}
+
+/** Platform-neutral attempt representation for backup/restore */
+@Serializable
+data class BackupAttempt(
+        val id: String,
+        val sessionId: String,
+        val problemId: String,
+        val result: AttemptResult,
+        val highestHold: String? = null,
+        val notes: String? = null,
+        val duration: Long? = null, // Duration in seconds
+        val restTime: Long? = null, // Rest time in seconds
+        val timestamp: String, // ISO 8601 format
+        val createdAt: String // ISO 8601 format
+) {
+    companion object {
+        /** Create BackupAttempt from native Android Attempt model */
+        fun fromAttempt(attempt: Attempt): BackupAttempt {
+            return BackupAttempt(
+                    id = attempt.id,
+                    sessionId = attempt.sessionId,
+                    problemId = attempt.problemId,
+                    result = attempt.result,
+                    highestHold = attempt.highestHold,
+                    notes = attempt.notes,
+                    duration = attempt.duration,
+                    restTime = attempt.restTime,
+                    timestamp = attempt.timestamp,
+                    createdAt = attempt.createdAt
+            )
+        }
+    }
+
+    /** Convert to native Android Attempt model */
+    fun toAttempt(): Attempt {
+        return Attempt(
+                id = id,
+                sessionId = sessionId,
+                problemId = problemId,
+                result = result,
+                highestHold = highestHold,
+                notes = notes,
+                duration = duration,
+                restTime = restTime,
+                timestamp = timestamp,
+                createdAt = createdAt
+        )
+    }
+}

android/app/src/main/java/com/atridad/openclimb/data/model/Problem.kt

@@ -4,71 +4,67 @@ import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import kotlinx.serialization.Serializable
 import java.time.LocalDateTime
+import kotlinx.serialization.Serializable
 
 @Entity(
-    tableName = "problems",
+        tableName = "problems",
-    foreignKeys = [
+        foreignKeys =
-        ForeignKey(
+                [
-            entity = Gym::class,
+                        ForeignKey(
-            parentColumns = ["id"],
+                                entity = Gym::class,
-            childColumns = ["gymId"],
+                                parentColumns = ["id"],
-            onDelete = ForeignKey.CASCADE
+                                childColumns = ["gymId"],
-        )
+                                onDelete = ForeignKey.CASCADE
-    ],
+                        )],
-    indices = [Index(value = ["gymId"])]
+        indices = [Index(value = ["gymId"])]
 )
 @Serializable
 data class Problem(
-    @PrimaryKey
+        @PrimaryKey val id: String,
-    val id: String,
+        val gymId: String,
-    val gymId: String,
+        val name: String? = null,
-    val name: String? = null,
+        val description: String? = null,
-    val description: String? = null,
+        val climbType: ClimbType,
-    val climbType: ClimbType,
+        val difficulty: DifficultyGrade,
-    val difficulty: DifficultyGrade,
+        val tags: List<String> = emptyList(),
-    val setter: String? = null,
+        val location: String? = null,
-    val tags: List<String> = emptyList(),
+        val imagePaths: List<String> = emptyList(),
-    val location: String? = null,
+        val isActive: Boolean = true,
-    val imagePaths: List<String> = emptyList(),
+        val dateSet: String? = null,
-    val isActive: Boolean = true,
+        val notes: String? = null,
-    val dateSet: String? = null,
+        val createdAt: String,
-    val notes: String? = null,
+        val updatedAt: String
-    val createdAt: String,
-    val updatedAt: String
 ) {
     companion object {
         fun create(
-            gymId: String,
+                gymId: String,
-            name: String? = null,
+                name: String? = null,
-            description: String? = null,
+                description: String? = null,
-            climbType: ClimbType,
+                climbType: ClimbType,
-            difficulty: DifficultyGrade,
+                difficulty: DifficultyGrade,
-            setter: String? = null,
+                tags: List<String> = emptyList(),
-            tags: List<String> = emptyList(),
+                location: String? = null,
-            location: String? = null,
+                imagePaths: List<String> = emptyList(),
-            imagePaths: List<String> = emptyList(),
+                dateSet: String? = null,
-            dateSet: String? = null,
+                notes: String? = null
-            notes: String? = null
         ): Problem {
             val now = LocalDateTime.now().toString()
             return Problem(
-                id = java.util.UUID.randomUUID().toString(),
+                    id = java.util.UUID.randomUUID().toString(),
-                gymId = gymId,
+                    gymId = gymId,
-                name = name,
+                    name = name,
-                description = description,
+                    description = description,
-                climbType = climbType,
+                    climbType = climbType,
-                difficulty = difficulty,
+                    difficulty = difficulty,
-                setter = setter,
+                    tags = tags,
-                tags = tags,
+                    location = location,
-                location = location,
+                    imagePaths = imagePaths,
-                imagePaths = imagePaths,
+                    isActive = true,
-                isActive = true,
+                    dateSet = dateSet,
-                dateSet = dateSet,
+                    notes = notes,
-                notes = notes,
+                    createdAt = now,
-                createdAt = now,
+                    updatedAt = now
-                updatedAt = now
             )
         }
     }

android/app/src/main/java/com/atridad/openclimb/data/repository/ClimbRepository.kt

@@ -2,6 +2,11 @@ package com.atridad.openclimb.data.repository
 
 import android.content.Context
 import com.atridad.openclimb.data.database.OpenClimbDatabase
+import com.atridad.openclimb.data.format.BackupAttempt
+import com.atridad.openclimb.data.format.BackupClimbSession
+import com.atridad.openclimb.data.format.BackupGym
+import com.atridad.openclimb.data.format.BackupProblem
+import com.atridad.openclimb.data.format.ClimbDataBackup
 import com.atridad.openclimb.data.model.*
 import com.atridad.openclimb.utils.ZipExportImportUtils
 import java.io.File
@@ -27,7 +32,6 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
     suspend fun insertGym(gym: Gym) = gymDao.insertGym(gym)
     suspend fun updateGym(gym: Gym) = gymDao.updateGym(gym)
     suspend fun deleteGym(gym: Gym) = gymDao.deleteGym(gym)
-    fun searchGyms(query: String): Flow<List<Gym>> = gymDao.searchGyms(query)
 
     // Problem operations
     fun getAllProblems(): Flow<List<Problem>> = problemDao.getAllProblems()
@@ -36,7 +40,6 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
     suspend fun insertProblem(problem: Problem) = problemDao.insertProblem(problem)
     suspend fun updateProblem(problem: Problem) = problemDao.updateProblem(problem)
     suspend fun deleteProblem(problem: Problem) = problemDao.deleteProblem(problem)
-    fun searchProblems(query: String): Flow<List<Problem>> = problemDao.searchProblems(query)
 
     // Session operations
     fun getAllSessions(): Flow<List<ClimbSession>> = sessionDao.getAllSessions()
@@ -67,69 +70,9 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
     suspend fun updateAttempt(attempt: Attempt) = attemptDao.updateAttempt(attempt)
     suspend fun deleteAttempt(attempt: Attempt) = attemptDao.deleteAttempt(attempt)
 
-    // ZIP Export with images - Single format for reliability
-    suspend fun exportAllDataToZip(directory: File? = null): File {
-        try {
-            // Collect all data with proper error handling
-            val allGyms = gymDao.getAllGyms().first()
-            val allProblems = problemDao.getAllProblems().first()
-            val allSessions = sessionDao.getAllSessions().first()
-            val allAttempts = attemptDao.getAllAttempts().first()
-
-            // Validate data integrity before export
-            validateDataIntegrity(allGyms, allProblems, allSessions, allAttempts)
-
-            val exportData =
-                    ClimbDataExport(
-                            exportedAt = LocalDateTime.now().toString(),
-                            version = "1.0",
-                            gyms = allGyms,
-                            problems = allProblems,
-                            sessions = allSessions,
-                            attempts = allAttempts
-                    )
-
-            // Collect all referenced image paths and validate they exist
-            val referencedImagePaths = allProblems.flatMap { it.imagePaths }.toSet()
-            val validImagePaths =
-                    referencedImagePaths
-                            .filter { imagePath ->
-                                try {
-                                    val imageFile =
-                                            com.atridad.openclimb.utils.ImageUtils.getImageFile(
-                                                    context,
-                                                    imagePath
-                                            )
-                                    imageFile.exists() && imageFile.length() > 0
-                                } catch (e: Exception) {
-                                    false
-                                }
-                            }
-                            .toSet()
-
-            // Log any missing images for debugging
-            val missingImages = referencedImagePaths - validImagePaths
-            if (missingImages.isNotEmpty()) {
-                android.util.Log.w(
-                        "ClimbRepository",
-                        "Some referenced images are missing: $missingImages"
-                )
-            }
-
-            return ZipExportImportUtils.createExportZip(
-                    context = context,
-                    exportData = exportData,
-                    referencedImagePaths = validImagePaths,
-                    directory = directory
-            )
-        } catch (e: Exception) {
-            throw Exception("Export failed: ${e.message}")
-        }
-    }
-
     suspend fun exportAllDataToZipUri(context: Context, uri: android.net.Uri) {
         try {
-            // Collect all data with proper error handling
+            // Collect all data
             val allGyms = gymDao.getAllGyms().first()
             val allProblems = problemDao.getAllProblems().first()
             val allSessions = sessionDao.getAllSessions().first()
@@ -138,14 +81,16 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
             // Validate data integrity before export
             validateDataIntegrity(allGyms, allProblems, allSessions, allAttempts)
 
-            val exportData =
+            // Create backup data using platform-neutral format
-                    ClimbDataExport(
+            val backupData =
+                    ClimbDataBackup(
                             exportedAt = LocalDateTime.now().toString(),
-                            version = "1.0",
+                            version = "2.0",
-                            gyms = allGyms,
+                            formatVersion = "2.0",
-                            problems = allProblems,
+                            gyms = allGyms.map { BackupGym.fromGym(it) },
-                            sessions = allSessions,
+                            problems = allProblems.map { BackupProblem.fromProblem(it) },
-                            attempts = allAttempts
+                            sessions = allSessions.map { BackupClimbSession.fromClimbSession(it) },
+                            attempts = allAttempts.map { BackupAttempt.fromAttempt(it) }
                     )
 
             // Collect all referenced image paths and validate they exist
@@ -160,7 +105,7 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
                                                     imagePath
                                             )
                                     imageFile.exists() && imageFile.length() > 0
-                                } catch (e: Exception) {
+                                } catch (_: Exception) {
                                     false
                                 }
                             }
@@ -169,7 +114,7 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
             ZipExportImportUtils.createExportZipToUri(
                     context = context,
                     uri = uri,
-                    exportData = exportData,
+                    exportData = backupData,
                     referencedImagePaths = validImagePaths
             )
         } catch (e: Exception) {
@@ -195,7 +140,7 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
             // Parse and validate the data structure
             val importData =
                     try {
-                        json.decodeFromString<ClimbDataExport>(importResult.jsonContent)
+                        json.decodeFromString<ClimbDataBackup>(importResult.jsonContent)
                     } catch (e: Exception) {
                         throw Exception("Invalid data format: ${e.message}")
                     }
@@ -210,44 +155,47 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
             gymDao.deleteAllGyms()
 
             // Import gyms first (problems depend on gyms)
-            importData.gyms.forEach { gym ->
+            importData.gyms.forEach { backupGym ->
                 try {
-                    gymDao.insertGym(gym)
+                    gymDao.insertGym(backupGym.toGym())
                 } catch (e: Exception) {
-                    throw Exception("Failed to import gym ${gym.name}: ${e.message}")
+                    throw Exception("Failed to import gym '${backupGym.name}': ${e.message}")
                 }
             }
 
             // Import problems with updated image paths
-            val updatedProblems =
+            val updatedBackupProblems =
                     ZipExportImportUtils.updateProblemImagePaths(
                             importData.problems,
                             importResult.importedImagePaths
                     )
 
-            updatedProblems.forEach { problem ->
+            // Import problems (depends on gyms)
+            updatedBackupProblems.forEach { backupProblem ->
                 try {
-                    problemDao.insertProblem(problem)
+                    problemDao.insertProblem(backupProblem.toProblem())
                 } catch (e: Exception) {
-                    throw Exception("Failed to import problem ${problem.name}: ${e.message}")
+                    throw Exception(
+                            "Failed to import problem '${backupProblem.name}': ${e.message}"
+                    )
                 }
             }
 
             // Import sessions
-            importData.sessions.forEach { session ->
+            importData.sessions.forEach { backupSession ->
                 try {
-                    sessionDao.insertSession(session)
+                    sessionDao.insertSession(backupSession.toClimbSession())
                 } catch (e: Exception) {
-                    throw Exception("Failed to import session: ${e.message}")
+                    throw Exception("Failed to import session '${backupSession.id}': ${e.message}")
                 }
             }
 
             // Import attempts last (depends on problems and sessions)
-            importData.attempts.forEach { attempt ->
+            importData.attempts.forEach { backupAttempt ->
                 try {
-                    attemptDao.insertAttempt(attempt)
+                    attemptDao.insertAttempt(backupAttempt.toAttempt())
                 } catch (e: Exception) {
-                    throw Exception("Failed to import attempt: ${e.message}")
+                    throw Exception("Failed to import attempt '${backupAttempt.id}': ${e.message}")
                 }
             }
         } catch (e: Exception) {
@@ -291,7 +239,7 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
         }
     }
 
-    private fun validateImportData(importData: ClimbDataExport) {
+    private fun validateImportData(importData: ClimbDataBackup) {
         if (importData.gyms.isEmpty()) {
             throw Exception("Import data is invalid: no gyms found")
         }
@@ -339,13 +287,3 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
         }
     }
 }
-
-@kotlinx.serialization.Serializable
-data class ClimbDataExport(
-        val exportedAt: String,
-        val version: String = "1.0",
-        val gyms: List<Gym>,
-        val problems: List<Problem>,
-        val sessions: List<ClimbSession>,
-        val attempts: List<Attempt>
-)

android/app/src/main/java/com/atridad/openclimb/ui/screens/ProblemsScreen.kt

@@ -21,10 +21,7 @@ import com.atridad.openclimb.ui.viewmodel.ClimbViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun ProblemsScreen(
+fun ProblemsScreen(viewModel: ClimbViewModel, onNavigateToProblemDetail: (String) -> Unit) {
-    viewModel: ClimbViewModel,
-    onNavigateToProblemDetail: (String) -> Unit
-) {
     val problems by viewModel.problems.collectAsState()
     val gyms by viewModel.gyms.collectAsState()
     var showImageViewer by remember { mutableStateOf(false) }
@@ -36,32 +33,34 @@ fun ProblemsScreen(
     var selectedGym by remember { mutableStateOf<Gym?>(null) }
 
     // Apply filters
-    val filteredProblems = problems.filter { problem ->
+    val filteredProblems =
-        val climbTypeMatch = selectedClimbType?.let { it == problem.climbType } != false
+            problems.filter { problem ->
-        val gymMatch = selectedGym?.let { it.id == problem.gymId } != false
+                val climbTypeMatch = selectedClimbType?.let { it == problem.climbType } != false
-        climbTypeMatch && gymMatch
+                val gymMatch = selectedGym?.let { it.id == problem.gymId } != false
-    }
+                climbTypeMatch && gymMatch
+            }
 
-    Column(
+    // Separate active and inactive problems
-        modifier = Modifier
+    val activeProblems = filteredProblems.filter { it.isActive }
-            .fillMaxSize()
+    val inactiveProblems = filteredProblems.filter { !it.isActive }
-            .padding(16.dp)
+    val sortedProblems = activeProblems + inactiveProblems
-    ) {
+
+    Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
         Row(
-            modifier = Modifier.fillMaxWidth(),
+                modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
+                verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(12.dp)
+                horizontalArrangement = Arrangement.spacedBy(12.dp)
         ) {
             Icon(
-                painter = painterResource(id = R.drawable.ic_mountains),
+                    painter = painterResource(id = R.drawable.ic_mountains),
-                contentDescription = "OpenClimb Logo",
+                    contentDescription = "OpenClimb Logo",
-                modifier = Modifier.size(32.dp),
+                    modifier = Modifier.size(32.dp),
-                tint = MaterialTheme.colorScheme.primary
+                    tint = MaterialTheme.colorScheme.primary
             )
             Text(
-                text = "Problems & Routes",
+                    text = "Problems & Routes",
-                style = MaterialTheme.typography.headlineMedium,
+                    style = MaterialTheme.typography.headlineMedium,
-                fontWeight = FontWeight.Bold
+                    fontWeight = FontWeight.Bold
             )
         }
 
@@ -69,44 +68,38 @@ fun ProblemsScreen(
 
         // Filters Section
         if (problems.isNotEmpty()) {
-            Card(
+            Card(modifier = Modifier.fillMaxWidth()) {
-                modifier = Modifier.fillMaxWidth()
+                Column(modifier = Modifier.padding(16.dp)) {
-            ) {
-                Column(
-                    modifier = Modifier.padding(16.dp)
-                ) {
                     Text(
-                        text = "Filters",
+                            text = "Filters",
-                        style = MaterialTheme.typography.titleMedium,
+                            style = MaterialTheme.typography.titleMedium,
-                        fontWeight = FontWeight.Bold
+                            fontWeight = FontWeight.Bold
                     )
 
                     Spacer(modifier = Modifier.height(12.dp))
 
                     // Climb Type Filter
                     Text(
-                        text = "Climb Type",
+                            text = "Climb Type",
-                        style = MaterialTheme.typography.bodyMedium,
+                            style = MaterialTheme.typography.bodyMedium,
-                        fontWeight = FontWeight.Medium
+                            fontWeight = FontWeight.Medium
                     )
 
                     Spacer(modifier = Modifier.height(8.dp))
 
-                    LazyRow(
+                    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                        horizontalArrangement = Arrangement.spacedBy(8.dp)
-                    ) {
                         item {
                             FilterChip(
-                                onClick = { selectedClimbType = null },
+                                    onClick = { selectedClimbType = null },
-                                label = { Text("All Types") },
+                                    label = { Text("All Types") },
-                                selected = selectedClimbType == null
+                                    selected = selectedClimbType == null
                             )
                         }
                         items(ClimbType.entries) { climbType ->
                             FilterChip(
-                                onClick = { selectedClimbType = climbType },
+                                    onClick = { selectedClimbType = climbType },
-                                label = { Text(climbType.getDisplayName()) },
+                                    label = { Text(climbType.getDisplayName()) },
-                                selected = selectedClimbType == climbType
+                                    selected = selectedClimbType == climbType
                             )
                         }
                     }
@@ -115,28 +108,26 @@ fun ProblemsScreen(
 
                     // Gym Filter
                     Text(
-                        text = "Gym",
+                            text = "Gym",
-                        style = MaterialTheme.typography.bodyMedium,
+                            style = MaterialTheme.typography.bodyMedium,
-                        fontWeight = FontWeight.Medium
+                            fontWeight = FontWeight.Medium
                     )
 
                     Spacer(modifier = Modifier.height(8.dp))
 
-                    LazyRow(
+                    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                        horizontalArrangement = Arrangement.spacedBy(8.dp)
-                    ) {
                         item {
                             FilterChip(
-                                onClick = { selectedGym = null },
+                                    onClick = { selectedGym = null },
-                                label = { Text("All Gyms") },
+                                    label = { Text("All Gyms") },
-                                selected = selectedGym == null
+                                    selected = selectedGym == null
                             )
                         }
                         items(gyms) { gym ->
                             FilterChip(
-                                onClick = { selectedGym = gym },
+                                    onClick = { selectedGym = gym },
-                                label = { Text(gym.name) },
+                                    label = { Text(gym.name) },
-                                selected = selectedGym?.id == gym.id
+                                    selected = selectedGym?.id == gym.id
                             )
                         }
                     }
@@ -145,9 +136,10 @@ fun ProblemsScreen(
                     if (selectedClimbType != null || selectedGym != null) {
                         Spacer(modifier = Modifier.height(12.dp))
                         Text(
-                            text = "Showing ${filteredProblems.size} of ${problems.size} problems",
+                                text =
-                            style = MaterialTheme.typography.bodySmall,
+                                        "Showing ${filteredProblems.size} of ${problems.size} problems (${activeProblems.size} active, ${inactiveProblems.size} reset)",
-                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                                style = MaterialTheme.typography.bodySmall,
+                                color = MaterialTheme.colorScheme.onSurfaceVariant
                         )
                     }
                 }
@@ -158,31 +150,39 @@ fun ProblemsScreen(
 
         if (filteredProblems.isEmpty()) {
             EmptyStateMessage(
-                title = if (problems.isEmpty()) {
+                    title =
-                    if (gyms.isEmpty()) "No Gyms Available" else "No Problems Yet"
+                            if (problems.isEmpty()) {
-                } else {
+                                if (gyms.isEmpty()) "No Gyms Available" else "No Problems Yet"
-                    "No Problems Match Filters"
+                            } else {
-                },
+                                "No Problems Match Filters"
-                message = if (problems.isEmpty()) {
+                            },
-                    if (gyms.isEmpty()) "Add a gym first to start tracking problems and routes!" else "Start tracking your favorite problems and routes!"
+                    message =
-                } else {
+                            if (problems.isEmpty()) {
-                    "Try adjusting your filters to see more problems."
+                                if (gyms.isEmpty())
-                },
+                                        "Add a gym first to start tracking problems and routes!"
-                onActionClick = { },
+                                else "Start tracking your favorite problems and routes!"
-                actionText = ""
+                            } else {
+                                "Try adjusting your filters to see more problems."
+                            },
+                    onActionClick = {},
+                    actionText = ""
             )
         } else {
             LazyColumn {
-                items(filteredProblems) { problem ->
+                items(sortedProblems) { problem ->
                     ProblemCard(
-                        problem = problem,
+                            problem = problem,
-                        gymName = gyms.find { it.id == problem.gymId }?.name ?: "Unknown Gym",
+                            gymName = gyms.find { it.id == problem.gymId }?.name ?: "Unknown Gym",
-                        onClick = { onNavigateToProblemDetail(problem.id) },
+                            onClick = { onNavigateToProblemDetail(problem.id) },
-                        onImageClick = { imagePaths, index ->
+                            onImageClick = { imagePaths, index ->
-                            selectedImagePaths = imagePaths
+                                selectedImagePaths = imagePaths
-                            selectedImageIndex = index
+                                selectedImageIndex = index
-                            showImageViewer = true
+                                showImageViewer = true
-                        }
+                            },
+                            onToggleActive = {
+                                val updatedProblem = problem.copy(isActive = !problem.isActive)
+                                viewModel.updateProblem(updatedProblem)
+                            }
                     )
                     Spacer(modifier = Modifier.height(8.dp))
                 }
@@ -193,9 +193,9 @@ fun ProblemsScreen(
     // Fullscreen Image Viewer
     if (showImageViewer && selectedImagePaths.isNotEmpty()) {
         FullscreenImageViewer(
-            imagePaths = selectedImagePaths,
+                imagePaths = selectedImagePaths,
-            initialIndex = selectedImageIndex,
+                initialIndex = selectedImageIndex,
-            onDismiss = { showImageViewer = false }
+                onDismiss = { showImageViewer = false }
         )
     }
 }
@@ -203,51 +203,51 @@ fun ProblemsScreen(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ProblemCard(
-    problem: Problem,
+        problem: Problem,
-    gymName: String,
+        gymName: String,
-    onClick: () -> Unit,
+        onClick: () -> Unit,
-    onImageClick: ((List<String>, Int) -> Unit)? = null
+        onImageClick: ((List<String>, Int) -> Unit)? = null,
+        onToggleActive: (() -> Unit)? = null
 ) {
-    Card(
+    Card(onClick = onClick, modifier = Modifier.fillMaxWidth()) {
-        onClick = onClick,
+        Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) {
-        modifier = Modifier.fillMaxWidth()
-    ) {
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp)
-        ) {
             Row(
-                modifier = Modifier.fillMaxWidth(),
+                    modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
+                    horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.Top
+                    verticalAlignment = Alignment.Top
             ) {
                 Column(modifier = Modifier.weight(1f)) {
                     Text(
-                        text = problem.name ?: "Unnamed Problem",
+                            text = problem.name ?: "Unnamed Problem",
-                        style = MaterialTheme.typography.titleMedium,
+                            style = MaterialTheme.typography.titleMedium,
-                        fontWeight = FontWeight.Bold
+                            fontWeight = FontWeight.Bold,
+                            color =
+                                    if (problem.isActive) MaterialTheme.colorScheme.onSurface
+                                    else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f)
                     )
 
                     Text(
-                        text = gymName,
+                            text = gymName,
-                        style = MaterialTheme.typography.bodyMedium,
+                            style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color =
+                                    MaterialTheme.colorScheme.onSurfaceVariant.copy(
+                                            alpha = if (problem.isActive) 1f else 0.6f
+                                    )
                     )
                 }
 
                 Column(horizontalAlignment = Alignment.End) {
                     Text(
-                        text = problem.difficulty.grade,
+                            text = problem.difficulty.grade,
-                        style = MaterialTheme.typography.titleMedium,
+                            style = MaterialTheme.typography.titleMedium,
-                        fontWeight = FontWeight.Bold,
+                            fontWeight = FontWeight.Bold,
-                        color = MaterialTheme.colorScheme.primary
+                            color = MaterialTheme.colorScheme.primary
                     )
 
                     Text(
-                        text = problem.climbType.getDisplayName(),
+                            text = problem.climbType.getDisplayName(),
-                        style = MaterialTheme.typography.bodySmall,
+                            style = MaterialTheme.typography.bodySmall,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                            color = MaterialTheme.colorScheme.onSurfaceVariant
                     )
                 }
             }
@@ -255,9 +255,9 @@ fun ProblemCard(
             problem.location?.let { location ->
                 Spacer(modifier = Modifier.height(4.dp))
                 Text(
-                    text = "Location: $location",
+                        text = "Location: $location",
-                    style = MaterialTheme.typography.bodySmall,
+                        style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                        color = MaterialTheme.colorScheme.onSurfaceVariant
                 )
             }
 
@@ -266,9 +266,9 @@ fun ProblemCard(
                 Row {
                     problem.tags.take(3).forEach { tag ->
                         AssistChip(
-                            onClick = { },
+                                onClick = {},
-                            label = { Text(tag) },
+                                label = { Text(tag) },
-                            modifier = Modifier.padding(end = 4.dp)
+                                modifier = Modifier.padding(end = 4.dp)
                         )
                     }
                 }
@@ -278,22 +278,42 @@ fun ProblemCard(
             if (problem.imagePaths.isNotEmpty()) {
                 Spacer(modifier = Modifier.height(8.dp))
                 ImageDisplay(
-                    imagePaths = problem.imagePaths.take(3), // Show max 3 images in list
+                        imagePaths = problem.imagePaths.take(3), // Show max 3 images in list
-                    imageSize = 60,
+                        imageSize = 60,
-                    onImageClick = { index ->
+                        onImageClick = { index -> onImageClick?.invoke(problem.imagePaths, index) }
-                        onImageClick?.invoke(problem.imagePaths, index)
-                    }
                 )
             }
 
             if (!problem.isActive) {
                 Spacer(modifier = Modifier.height(8.dp))
                 Text(
-                    text = "Inactive",
+                        text = "Reset / No Longer Set",
-                    style = MaterialTheme.typography.bodySmall,
+                        style = MaterialTheme.typography.bodySmall,
-                    color = MaterialTheme.colorScheme.error
+                        color = MaterialTheme.colorScheme.tertiary,
+                        fontWeight = FontWeight.Medium
                 )
             }
+
+            // Toggle active button
+            if (onToggleActive != null) {
+                Spacer(modifier = Modifier.height(8.dp))
+                OutlinedButton(
+                        onClick = onToggleActive,
+                        colors =
+                                ButtonDefaults.outlinedButtonColors(
+                                        contentColor =
+                                                if (problem.isActive)
+                                                        MaterialTheme.colorScheme.tertiary
+                                                else MaterialTheme.colorScheme.primary
+                                ),
+                        modifier = Modifier.fillMaxWidth()
+                ) {
+                    Text(
+                            text = if (problem.isActive) "Mark as Reset" else "Mark as Active",
+                            style = MaterialTheme.typography.bodySmall
+                    )
+                }
+            }
         }
     }
 }

android/app/src/main/java/com/atridad/openclimb/ui/viewmodel/ClimbViewModel.kt

@@ -324,12 +324,17 @@ class ClimbViewModel(private val repository: ClimbRepository) : ViewModel() {
     fun exportDataToZipUri(context: Context, uri: android.net.Uri) {
         viewModelScope.launch {
             try {
-                _uiState.value = _uiState.value.copy(isLoading = true)
+                _uiState.value =
+                        _uiState.value.copy(
+                                isLoading = true,
+                                message = "Creating ZIP file with images..."
+                        )
                 repository.exportAllDataToZipUri(context, uri)
                 _uiState.value =
                         _uiState.value.copy(
                                 isLoading = false,
-                                message = "Data with images exported successfully"
+                                message =
+                                        "Export complete! Your climbing data and images have been saved."
                         )
             } catch (e: Exception) {
                 _uiState.value =

android/app/src/main/java/com/atridad/openclimb/utils/SessionShareUtils.kt

@@ -5,38 +5,35 @@ import android.content.Intent
 import android.graphics.*
 import android.graphics.drawable.GradientDrawable
 import androidx.core.content.FileProvider
+import androidx.core.graphics.createBitmap
+import androidx.core.graphics.toColorInt
 import com.atridad.openclimb.data.model.*
 import java.io.File
 import java.io.FileOutputStream
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import kotlin.math.roundToInt
-import androidx.core.graphics.createBitmap
-import androidx.core.graphics.toColorInt
 
 object SessionShareUtils {
 
     data class SessionStats(
-        val totalAttempts: Int,
+            val totalAttempts: Int,
-        val successfulAttempts: Int,
+            val successfulAttempts: Int,
-        val problems: List<Problem>,
+            val problems: List<Problem>,
-        val uniqueProblemsAttempted: Int,
+            val uniqueProblemsAttempted: Int,
-        val uniqueProblemsCompleted: Int,
+            val uniqueProblemsCompleted: Int,
-        val averageGrade: String?,
+            val averageGrade: String?,
-        val sessionDuration: String,
+            val sessionDuration: String,
-        val topResult: AttemptResult?,
+            val topResult: AttemptResult?,
-        val topGrade: String?
+            val topGrade: String?
     )
 
     fun calculateSessionStats(
-        session: ClimbSession,
+            session: ClimbSession,
-        attempts: List<Attempt>,
+            attempts: List<Attempt>,
-        problems: List<Problem>
+            problems: List<Problem>
     ): SessionStats {
-        val successfulResults = listOf(
+        val successfulResults = listOf(AttemptResult.SUCCESS, AttemptResult.FLASH)
-            AttemptResult.SUCCESS, 
-            AttemptResult.FLASH
-        )
 
         val successfulAttempts = attempts.filter { it.result in successfulResults }
         val uniqueProblems = attempts.map { it.problemId }.distinct()
@@ -52,12 +49,14 @@ object SessionShareUtils {
         val ropeAverage = calculateAverageGrade(ropeProblems, "Rope")
 
         // Combine averages for display
-        val averageGrade = when {
+        val averageGrade =
-            boulderAverage != null && ropeAverage != null -> "$boulderAverage / $ropeAverage"
+                when {
-            boulderAverage != null -> boulderAverage
+                    boulderAverage != null && ropeAverage != null ->
-            ropeAverage != null -> ropeAverage
+                            "$boulderAverage / $ropeAverage"
-            else -> null
+                    boulderAverage != null -> boulderAverage
-        }
+                    ropeAverage != null -> ropeAverage
+                    else -> null
+                }
 
         // Determine highest achieved grade (only from completed problems: SUCCESS or FLASH)
         val completedProblems = problems.filter { it.id in uniqueCompletedProblems }
@@ -65,33 +64,37 @@ object SessionShareUtils {
         val completedRope = completedProblems.filter { it.climbType == ClimbType.ROPE }
         val topBoulder = highestGradeForProblems(completedBoulder)
         val topRope = highestGradeForProblems(completedRope)
-        val topGrade = when {
+        val topGrade =
-            topBoulder != null && topRope != null -> "$topBoulder / $topRope"
+                when {
-            topBoulder != null -> topBoulder
+                    topBoulder != null && topRope != null -> "$topBoulder / $topRope"
-            topRope != null -> topRope
+                    topBoulder != null -> topBoulder
-            else -> null
+                    topRope != null -> topRope
-        }
+                    else -> null
+                }
 
         val duration = if (session.duration != null) "${session.duration}m" else "Unknown"
-        val topResult = attempts.maxByOrNull { 
+        val topResult =
-            when (it.result) {
+                attempts
-                AttemptResult.FLASH -> 3
+                        .maxByOrNull {
-                AttemptResult.SUCCESS -> 2
+                            when (it.result) {
-                AttemptResult.FALL -> 1
+                                AttemptResult.FLASH -> 3
-                else -> 0
+                                AttemptResult.SUCCESS -> 2
-            }
+                                AttemptResult.FALL -> 1
-        }?.result
+                                else -> 0
+                            }
+                        }
+                        ?.result
 
         return SessionStats(
-            totalAttempts = attempts.size,
+                totalAttempts = attempts.size,
-            successfulAttempts = successfulAttempts.size,
+                successfulAttempts = successfulAttempts.size,
-            problems = attemptedProblems,
+                problems = attemptedProblems,
-            uniqueProblemsAttempted = uniqueProblems.size,
+                uniqueProblemsAttempted = uniqueProblems.size,
-            uniqueProblemsCompleted = uniqueCompletedProblems.size,
+                uniqueProblemsCompleted = uniqueCompletedProblems.size,
-            averageGrade = averageGrade,
+                averageGrade = averageGrade,
-            sessionDuration = duration,
+                sessionDuration = duration,
-            topResult = topResult,
+                topResult = topResult,
-            topGrade = topGrade
+                topGrade = topGrade
         )
     }
 
@@ -109,35 +112,39 @@ object SessionShareUtils {
         problemsBySystem.forEach { (system, systemProblems) ->
             when (system) {
                 DifficultySystem.V_SCALE -> {
-                    val gradeValues = systemProblems.mapNotNull { problem ->
+                    val gradeValues =
-                        when {
+                            systemProblems.mapNotNull { problem ->
-                            problem.difficulty.grade == "VB" -> 0
+                                when {
-                            else -> problem.difficulty.grade.removePrefix("V").toIntOrNull()
+                                    problem.difficulty.grade == "VB" -> 0
-                        }
+                                    else -> problem.difficulty.grade.removePrefix("V").toIntOrNull()
-                    }
+                                }
+                            }
                     if (gradeValues.isNotEmpty()) {
                         val avg = gradeValues.average().roundToInt()
                         averages.add(if (avg == 0) "VB" else "V$avg")
                     }
                 }
                 DifficultySystem.FONT -> {
-                    val gradeValues = systemProblems.mapNotNull { problem ->
+                    val gradeValues =
-                        // Extract numeric part from Font grades (e.g., "6A" -> 6, "7C+" -> 7)
+                            systemProblems.mapNotNull { problem ->
-                        problem.difficulty.grade.filter { it.isDigit() }.toIntOrNull()
+                                // Extract numeric part from Font grades (e.g., "6A" -> 6, "7C+" ->
-                    }
+                                // 7)
+                                problem.difficulty.grade.filter { it.isDigit() }.toIntOrNull()
+                            }
                     if (gradeValues.isNotEmpty()) {
                         val avg = gradeValues.average().roundToInt()
                         averages.add("$avg")
                     }
                 }
                 DifficultySystem.YDS -> {
-                    val gradeValues = systemProblems.mapNotNull { problem ->
+                    val gradeValues =
-                        // Extract numeric part from YDS grades (e.g., "5.10a" -> 5.10)
+                            systemProblems.mapNotNull { problem ->
-                        val grade = problem.difficulty.grade
+                                // Extract numeric part from YDS grades (e.g., "5.10a" -> 5.10)
-                        if (grade.startsWith("5.")) {
+                                val grade = problem.difficulty.grade
-                            grade.substring(2).toDoubleOrNull()
+                                if (grade.startsWith("5.")) {
-                        } else null
+                                    grade.substring(2).toDoubleOrNull()
-                    }
+                                } else null
+                            }
                     if (gradeValues.isNotEmpty()) {
                         val avg = gradeValues.average()
                         averages.add("5.${String.format("%.1f", avg)}")
@@ -145,9 +152,13 @@ object SessionShareUtils {
                 }
                 DifficultySystem.CUSTOM -> {
                     // For custom systems, try to extract numeric values
-                    val gradeValues = systemProblems.mapNotNull { problem ->
+                    val gradeValues =
-                        problem.difficulty.grade.filter { it.isDigit() || it == '.' || it == '-' }.toDoubleOrNull()
+                            systemProblems.mapNotNull { problem ->
-                    }
+                                problem.difficulty
+                                        .grade
+                                        .filter { it.isDigit() || it == '.' || it == '-' }
+                                        .toDoubleOrNull()
+                            }
                     if (gradeValues.isNotEmpty()) {
                         val avg = gradeValues.average()
                         averages.add(String.format("%.1f", avg))
@@ -166,10 +177,10 @@ object SessionShareUtils {
     }
 
     fun generateShareCard(
-        context: Context,
+            context: Context,
-        session: ClimbSession,
+            session: ClimbSession,
-        gym: Gym,
+            gym: Gym,
-        stats: SessionStats
+            stats: SessionStats
     ): File? {
         return try {
             val width = 1242 // 3:4 aspect at higher resolution for better fit
@@ -178,53 +189,56 @@ object SessionShareUtils {
             val bitmap = createBitmap(width, height)
             val canvas = Canvas(bitmap)
 
-            val gradientDrawable = GradientDrawable(
+            val gradientDrawable =
-                GradientDrawable.Orientation.TOP_BOTTOM,
+                    GradientDrawable(
-                intArrayOf(
+                            GradientDrawable.Orientation.TOP_BOTTOM,
-                    "#667eea".toColorInt(),
+                            intArrayOf("#667eea".toColorInt(), "#764ba2".toColorInt())
-                    "#764ba2".toColorInt()
+                    )
-                )
-            )
             gradientDrawable.setBounds(0, 0, width, height)
             gradientDrawable.draw(canvas)
 
             // Setup paint objects
-            val titlePaint = Paint().apply {
+            val titlePaint =
-                color = Color.WHITE
+                    Paint().apply {
-                textSize = 72f
+                        color = Color.WHITE
-                typeface = Typeface.DEFAULT_BOLD
+                        textSize = 72f
-                isAntiAlias = true
+                        typeface = Typeface.DEFAULT_BOLD
-                textAlign = Paint.Align.CENTER
+                        isAntiAlias = true
-            }
+                        textAlign = Paint.Align.CENTER
+                    }
 
-            val subtitlePaint = Paint().apply {
+            val subtitlePaint =
-                color = "#E8E8E8".toColorInt()
+                    Paint().apply {
-                textSize = 48f
+                        color = "#E8E8E8".toColorInt()
-                typeface = Typeface.DEFAULT
+                        textSize = 48f
-                isAntiAlias = true
+                        typeface = Typeface.DEFAULT
-                textAlign = Paint.Align.CENTER
+                        isAntiAlias = true
-            }
+                        textAlign = Paint.Align.CENTER
+                    }
 
-            val statLabelPaint = Paint().apply {
+            val statLabelPaint =
-                color = "#B8B8B8".toColorInt()
+                    Paint().apply {
-                textSize = 36f
+                        color = "#B8B8B8".toColorInt()
-                typeface = Typeface.DEFAULT
+                        textSize = 36f
-                isAntiAlias = true
+                        typeface = Typeface.DEFAULT
-                textAlign = Paint.Align.CENTER
+                        isAntiAlias = true
-            }
+                        textAlign = Paint.Align.CENTER
+                    }
 
-            val statValuePaint = Paint().apply {
+            val statValuePaint =
-                color = Color.WHITE
+                    Paint().apply {
-                textSize = 64f
+                        color = Color.WHITE
-                typeface = Typeface.DEFAULT_BOLD
+                        textSize = 64f
-                isAntiAlias = true
+                        typeface = Typeface.DEFAULT_BOLD
-                textAlign = Paint.Align.CENTER
+                        isAntiAlias = true
-            }
+                        textAlign = Paint.Align.CENTER
+                    }
 
-            val cardPaint = Paint().apply {
+            val cardPaint =
-                color = "#40FFFFFF".toColorInt()
+                    Paint().apply {
-                isAntiAlias = true
+                        color = "#40FFFFFF".toColorInt()
-            }
+                        isAntiAlias = true
+                    }
 
             // Draw main card background
             val cardRect = RectF(60f, 200f, width - 60f, height - 120f)
@@ -252,49 +266,122 @@ object SessionShareUtils {
 
             // Left column stats
             var leftY = statsStartY
-            drawStatItemFitting(canvas, columnWidth / 2f, leftY, "Attempts", stats.totalAttempts.toString(), statLabelPaint, statValuePaint, columnMaxTextWidth)
+            drawStatItemFitting(
+                    canvas,
+                    columnWidth / 2f,
+                    leftY,
+                    "Attempts",
+                    stats.totalAttempts.toString(),
+                    statLabelPaint,
+                    statValuePaint,
+                    columnMaxTextWidth
+            )
             leftY += 120f
-            drawStatItemFitting(canvas, columnWidth / 2f, leftY, "Problems", stats.uniqueProblemsAttempted.toString(), statLabelPaint, statValuePaint, columnMaxTextWidth)
+            drawStatItemFitting(
+                    canvas,
+                    columnWidth / 2f,
+                    leftY,
+                    "Problems",
+                    stats.uniqueProblemsAttempted.toString(),
+                    statLabelPaint,
+                    statValuePaint,
+                    columnMaxTextWidth
+            )
             leftY += 120f
-            drawStatItemFitting(canvas, columnWidth / 2f, leftY, "Duration", stats.sessionDuration, statLabelPaint, statValuePaint, columnMaxTextWidth)
+            drawStatItemFitting(
+                    canvas,
+                    columnWidth / 2f,
+                    leftY,
+                    "Duration",
+                    stats.sessionDuration,
+                    statLabelPaint,
+                    statValuePaint,
+                    columnMaxTextWidth
+            )
 
             // Right column stats
             var rightY = statsStartY
-            drawStatItemFitting(canvas, width - columnWidth / 2f, rightY, "Successful", stats.successfulAttempts.toString(), statLabelPaint, statValuePaint, columnMaxTextWidth)
+            drawStatItemFitting(
-            rightY += 120f
+                    canvas,
-            drawStatItemFitting(canvas, width - columnWidth / 2f, rightY, "Completed", stats.uniqueProblemsCompleted.toString(), statLabelPaint, statValuePaint, columnMaxTextWidth)
+                    width - columnWidth / 2f,
+                    rightY,
+                    "Completed",
+                    stats.uniqueProblemsCompleted.toString(),
+                    statLabelPaint,
+                    statValuePaint,
+                    columnMaxTextWidth
+            )
             rightY += 120f
 
             var rightYAfter = rightY
             stats.topGrade?.let { grade ->
-                drawStatItemFitting(canvas, width - columnWidth / 2f, rightY, "Top Grade", grade, statLabelPaint, statValuePaint, columnMaxTextWidth)
+                drawStatItemFitting(
+                        canvas,
+                        width - columnWidth / 2f,
+                        rightY,
+                        "Top Grade",
+                        grade,
+                        statLabelPaint,
+                        statValuePaint,
+                        columnMaxTextWidth
+                )
                 rightYAfter += 120f
             }
 
             // Grade range(s)
-            val boulderRange = gradeRangeForProblems(stats.problems.filter { it.climbType == ClimbType.BOULDER })
+            val boulderRange =
-            val ropeRange = gradeRangeForProblems(stats.problems.filter { it.climbType == ClimbType.ROPE })
+                    gradeRangeForProblems(
+                            stats.problems.filter { it.climbType == ClimbType.BOULDER }
+                    )
+            val ropeRange =
+                    gradeRangeForProblems(stats.problems.filter { it.climbType == ClimbType.ROPE })
             val rangesY = kotlin.math.max(leftY, rightYAfter) + 120f
             if (boulderRange != null && ropeRange != null) {
                 // Two evenly spaced items
-                drawStatItemFitting(canvas, columnWidth / 2f, rangesY, "Boulder Range", boulderRange, statLabelPaint, statValuePaint, columnMaxTextWidth)
+                drawStatItemFitting(
-                drawStatItemFitting(canvas, width - columnWidth / 2f, rangesY, "Rope Range", ropeRange, statLabelPaint, statValuePaint, columnMaxTextWidth)
+                        canvas,
+                        columnWidth / 2f,
+                        rangesY,
+                        "Boulder Range",
+                        boulderRange,
+                        statLabelPaint,
+                        statValuePaint,
+                        columnMaxTextWidth
+                )
+                drawStatItemFitting(
+                        canvas,
+                        width - columnWidth / 2f,
+                        rangesY,
+                        "Rope Range",
+                        ropeRange,
+                        statLabelPaint,
+                        statValuePaint,
+                        columnMaxTextWidth
+                )
             } else if (boulderRange != null || ropeRange != null) {
                 // Single centered item
                 val singleRange = boulderRange ?: ropeRange ?: ""
-                drawStatItemFitting(canvas, width / 2f, rangesY, "Grade Range", singleRange, statLabelPaint, statValuePaint, width - 200f)
+                drawStatItemFitting(
+                        canvas,
+                        width / 2f,
+                        rangesY,
+                        "Grade Range",
+                        singleRange,
+                        statLabelPaint,
+                        statValuePaint,
+                        width - 200f
+                )
             }
 
-
-            
             // App branding
-            val brandingPaint = Paint().apply {
+            val brandingPaint =
-                color = "#80FFFFFF".toColorInt()
+                    Paint().apply {
-                textSize = 32f
+                        color = "#80FFFFFF".toColorInt()
-                typeface = Typeface.DEFAULT
+                        textSize = 32f
-                isAntiAlias = true
+                        typeface = Typeface.DEFAULT
-                textAlign = Paint.Align.CENTER
+                        isAntiAlias = true
-            }
+                        textAlign = Paint.Align.CENTER
+                    }
             canvas.drawText("OpenClimb", width / 2f, height - 40f, brandingPaint)
 
             // Save to file
@@ -321,30 +408,31 @@ object SessionShareUtils {
     }
 
     private fun drawStatItem(
-        canvas: Canvas,
+            canvas: Canvas,
-        x: Float,
+            x: Float,
-        y: Float,
+            y: Float,
-        label: String,
+            label: String,
-        value: String,
+            value: String,
-        labelPaint: Paint,
+            labelPaint: Paint,
-        valuePaint: Paint
+            valuePaint: Paint
     ) {
         canvas.drawText(value, x, y, valuePaint)
         canvas.drawText(label, x, y + 50f, labelPaint)
     }
 
     /**
-     * Draws a stat item while fitting the value text to a max width by reducing text size if needed.
+     * Draws a stat item while fitting the value text to a max width by reducing text size if
+     * needed.
      */
     private fun drawStatItemFitting(
-        canvas: Canvas,
+            canvas: Canvas,
-        x: Float,
+            x: Float,
-        y: Float,
+            y: Float,
-        label: String,
+            label: String,
-        value: String,
+            value: String,
-        labelPaint: Paint,
+            labelPaint: Paint,
-        valuePaint: Paint,
+            valuePaint: Paint,
-        maxTextWidth: Float
+            maxTextWidth: Float
     ) {
         val tempPaint = Paint(valuePaint)
         var textSize = tempPaint.textSize
@@ -368,8 +456,6 @@ object SessionShareUtils {
         return "${sorted.first().grade} - ${sorted.last().grade}"
     }
 
-
-    
     private fun formatSessionDate(dateString: String): String {
         return try {
             val formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME
@@ -383,19 +469,24 @@ object SessionShareUtils {
 
     fun shareSessionCard(context: Context, imageFile: File) {
         try {
-            val uri = FileProvider.getUriForFile(
+            val uri =
-                context,
+                    FileProvider.getUriForFile(
-                "${context.packageName}.fileprovider",
+                            context,
-                imageFile
+                            "${context.packageName}.fileprovider",
-            )
+                            imageFile
+                    )
 
-            val shareIntent = Intent().apply {
+            val shareIntent =
-                action = Intent.ACTION_SEND
+                    Intent().apply {
-                type = "image/png"
+                        action = Intent.ACTION_SEND
-                putExtra(Intent.EXTRA_STREAM, uri)
+                        type = "image/png"
-                putExtra(Intent.EXTRA_TEXT, "Check out my climbing session! 🧗‍♀️ #OpenClimb")
+                        putExtra(Intent.EXTRA_STREAM, uri)
-                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                        putExtra(
-            }
+                                Intent.EXTRA_TEXT,
+                                "Check out my climbing session! 🧗‍♀️ #OpenClimb"
+                        )
+                        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    }
 
             val chooser = Intent.createChooser(shareIntent, "Share Session")
             chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -406,16 +497,18 @@ object SessionShareUtils {
     }
 
     /**
-     * Returns the highest grade string among the given problems, respecting their difficulty system.
+     * Returns the highest grade string among the given problems, respecting their difficulty
+     * system.
      */
     private fun highestGradeForProblems(problems: List<Problem>): String? {
         if (problems.isEmpty()) return null
-        return problems.maxByOrNull { p -> gradeRank(p.difficulty.system, p.difficulty.grade) }?.difficulty?.grade
+        return problems
+                .maxByOrNull { p -> gradeRank(p.difficulty.system, p.difficulty.grade) }
+                ?.difficulty
+                ?.grade
     }
 
-    /**
+    /** Produces a comparable numeric rank for grades across supported systems. */
-     * Produces a comparable numeric rank for grades across supported systems.
-     */
     private fun gradeRank(system: DifficultySystem, grade: String): Double {
         return when (system) {
             DifficultySystem.V_SCALE -> {
@@ -424,7 +517,8 @@ object SessionShareUtils {
             DifficultySystem.FONT -> {
                 val list = DifficultySystem.FONT.getAvailableGrades()
                 val idx = list.indexOf(grade.uppercase())
-                if (idx >= 0) idx.toDouble() else grade.filter { it.isDigit() }.toDoubleOrNull() ?: -1.0
+                if (idx >= 0) idx.toDouble()
+                else grade.filter { it.isDigit() }.toDoubleOrNull() ?: -1.0
             }
             DifficultySystem.YDS -> {
                 // Parse 5.X with optional letter a-d
@@ -434,13 +528,14 @@ object SessionShareUtils {
                 val numberPart = tail.takeWhile { it.isDigit() || it == '.' }
                 val letterPart = tail.drop(numberPart.length).firstOrNull()
                 val base = numberPart.toDoubleOrNull() ?: return -1.0
-                val letterWeight = when (letterPart) {
+                val letterWeight =
-                    'a' -> 0.0
+                        when (letterPart) {
-                    'b' -> 0.1
+                            'a' -> 0.0
-                    'c' -> 0.2
+                            'b' -> 0.1
-                    'd' -> 0.3
+                            'c' -> 0.2
-                    else -> 0.0
+                            'd' -> 0.3
-                }
+                            else -> 0.0
+                        }
                 base + letterWeight
             }
             DifficultySystem.CUSTOM -> {

android/app/src/main/java/com/atridad/openclimb/utils/ZipExportImportUtils.kt

@@ -1,7 +1,8 @@
 package com.atridad.openclimb.utils
 
 import android.content.Context
-import kotlinx.serialization.json.Json
+import com.atridad.openclimb.data.format.BackupProblem
+import com.atridad.openclimb.data.format.ClimbDataBackup
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
@@ -10,6 +11,8 @@ import java.time.LocalDateTime
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import java.util.zip.ZipOutputStream
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 
 object ZipExportImportUtils {
 
@@ -26,12 +29,19 @@ object ZipExportImportUtils {
      * @return The created ZIP file
      */
     fun createExportZip(
-        context: Context,
+            context: Context,
-        exportData: com.atridad.openclimb.data.repository.ClimbDataExport,
+            exportData: ClimbDataBackup,
-        referencedImagePaths: Set<String>,
+            referencedImagePaths: Set<String>,
-        directory: File? = null
+            directory: File? = null
     ): File {
-        val exportDir = directory ?: File(context.getExternalFilesDir(android.os.Environment.DIRECTORY_DOCUMENTS), "OpenClimb")
+        val exportDir =
+                directory
+                        ?: File(
+                                context.getExternalFilesDir(
+                                        android.os.Environment.DIRECTORY_DOCUMENTS
+                                ),
+                                "OpenClimb"
+                        )
         if (!exportDir.exists()) {
             exportDir.mkdirs()
         }
@@ -53,7 +63,7 @@ object ZipExportImportUtils {
                     prettyPrint = true
                     ignoreUnknownKeys = true
                 }
-                val jsonString = json.encodeToString(com.atridad.openclimb.data.repository.ClimbDataExport.serializer(), exportData)
+                val jsonString = json.encodeToString(exportData)
 
                 val jsonEntry = ZipEntry(DATA_JSON_FILENAME)
                 zipOut.putNextEntry(jsonEntry)
@@ -75,15 +85,24 @@ object ZipExportImportUtils {
                             zipOut.closeEntry()
                             successfulImages++
                         } else {
-                            android.util.Log.w("ZipExportImportUtils", "Image file not found or empty: $imagePath")
+                            android.util.Log.w(
+                                    "ZipExportImportUtils",
+                                    "Image file not found or empty: $imagePath"
+                            )
                         }
                     } catch (e: Exception) {
-                        android.util.Log.e("ZipExportImportUtils", "Failed to add image $imagePath: ${e.message}")
+                        android.util.Log.e(
+                                "ZipExportImportUtils",
+                                "Failed to add image $imagePath: ${e.message}"
+                        )
                     }
                 }
 
                 // Log export summary
-                android.util.Log.i("ZipExportImportUtils", "Export completed: ${successfulImages}/${referencedImagePaths.size} images included")
+                android.util.Log.i(
+                        "ZipExportImportUtils",
+                        "Export completed: ${successfulImages}/${referencedImagePaths.size} images included"
+                )
             }
 
             // Validate the created ZIP file
@@ -92,7 +111,6 @@ object ZipExportImportUtils {
             }
 
             return zipFile
-            
         } catch (e: Exception) {
             // Clean up failed export
             if (zipFile.exists()) {
@@ -110,10 +128,10 @@ object ZipExportImportUtils {
      * @param referencedImagePaths Set of image paths referenced in the data
      */
     fun createExportZipToUri(
-        context: Context,
+            context: Context,
-        uri: android.net.Uri,
+            uri: android.net.Uri,
-        exportData: com.atridad.openclimb.data.repository.ClimbDataExport,
+            exportData: ClimbDataBackup,
-        referencedImagePaths: Set<String>
+            referencedImagePaths: Set<String>
     ) {
         try {
             context.contentResolver.openOutputStream(uri)?.use { outputStream ->
@@ -130,7 +148,7 @@ object ZipExportImportUtils {
                         prettyPrint = true
                         ignoreUnknownKeys = true
                     }
-                    val jsonString = json.encodeToString(com.atridad.openclimb.data.repository.ClimbDataExport.serializer(), exportData)
+                    val jsonString = json.encodeToString(exportData)
 
                     val jsonEntry = ZipEntry(DATA_JSON_FILENAME)
                     zipOut.putNextEntry(jsonEntry)
@@ -153,22 +171,28 @@ object ZipExportImportUtils {
                                 successfulImages++
                             }
                         } catch (e: Exception) {
-                            android.util.Log.e("ZipExportImportUtils", "Failed to add image $imagePath: ${e.message}")
+                            android.util.Log.e(
+                                    "ZipExportImportUtils",
+                                    "Failed to add image $imagePath: ${e.message}"
+                            )
                         }
                     }
 
-                    android.util.Log.i("ZipExportImportUtils", "Export to URI completed: ${successfulImages}/${referencedImagePaths.size} images included")
+                    android.util.Log.i(
+                            "ZipExportImportUtils",
+                            "Export to URI completed: ${successfulImages}/${referencedImagePaths.size} images included"
+                    )
                 }
-            } ?: throw IOException("Could not open output stream")
+            }
-            
+                    ?: throw IOException("Could not open output stream")
         } catch (e: Exception) {
             throw IOException("Failed to create export ZIP to URI: ${e.message}")
         }
     }
 
     private fun createMetadata(
-        exportData: com.atridad.openclimb.data.repository.ClimbDataExport,
+            exportData: ClimbDataBackup,
-        referencedImagePaths: Set<String>
+            referencedImagePaths: Set<String>
     ): String {
         return buildString {
             appendLine("OpenClimb Export Metadata")
@@ -184,12 +208,10 @@ object ZipExportImportUtils {
         }
     }
 
-    /**
+    /** Data class to hold extraction results */
-     * Data class to hold extraction results
-     */
     data class ImportResult(
-        val jsonContent: String,
+            val jsonContent: String,
-        val importedImagePaths: Map<String, String> // original filename -> new relative path
+            val importedImagePaths: Map<String, String> // original filename -> new relative path
     )
 
     /**
@@ -200,7 +222,6 @@ object ZipExportImportUtils {
      */
     fun extractImportZip(context: Context, zipFile: File): ImportResult {
         var jsonContent = ""
-        var metadataContent = ""
         val importedImagePaths = mutableMapOf<String, String>()
         var foundRequiredFiles = mutableSetOf<String>()
 
@@ -212,28 +233,32 @@ object ZipExportImportUtils {
                     when {
                         entry.name == METADATA_FILENAME -> {
                             // Read metadata for validation
-                            metadataContent = zipIn.readBytes().toString(Charsets.UTF_8)
+                            val metadataContent = zipIn.readBytes().toString(Charsets.UTF_8)
                             foundRequiredFiles.add("metadata")
-                            android.util.Log.i("ZipExportImportUtils", "Found metadata: ${metadataContent.lines().take(3).joinToString()}")
+                            android.util.Log.i(
+                                    "ZipExportImportUtils",
+                                    "Found metadata: ${metadataContent.lines().take(3).joinToString()}"
+                            )
                         }
-                        
                         entry.name == DATA_JSON_FILENAME -> {
                             // Read JSON data
                             jsonContent = zipIn.readBytes().toString(Charsets.UTF_8)
                             foundRequiredFiles.add("data")
                         }
-                        
                         entry.name.startsWith("$IMAGES_DIR_NAME/") && !entry.isDirectory -> {
                             // Extract image file
                             val originalFilename = entry.name.substringAfter("$IMAGES_DIR_NAME/")
 
                             try {
                                 // Create temporary file to hold the extracted image
-                                val tempFile = File.createTempFile("import_image_", "_$originalFilename", context.cacheDir)
+                                val tempFile =
+                                        File.createTempFile(
+                                                "import_image_",
+                                                "_$originalFilename",
+                                                context.cacheDir
+                                        )
 
-                                FileOutputStream(tempFile).use { output ->
+                                FileOutputStream(tempFile).use { output -> zipIn.copyTo(output) }
-                                    zipIn.copyTo(output)
-                                }
 
                                 // Validate the extracted image
                                 if (tempFile.exists() && tempFile.length() > 0) {
@@ -241,24 +266,37 @@ object ZipExportImportUtils {
                                     val newPath = ImageUtils.importImageFile(context, tempFile)
                                     if (newPath != null) {
                                         importedImagePaths[originalFilename] = newPath
-                                        android.util.Log.d("ZipExportImportUtils", "Successfully imported image: $originalFilename -> $newPath")
+                                        android.util.Log.d(
+                                                "ZipExportImportUtils",
+                                                "Successfully imported image: $originalFilename -> $newPath"
+                                        )
                                     } else {
-                                        android.util.Log.w("ZipExportImportUtils", "Failed to import image: $originalFilename")
+                                        android.util.Log.w(
+                                                "ZipExportImportUtils",
+                                                "Failed to import image: $originalFilename"
+                                        )
                                     }
                                 } else {
-                                    android.util.Log.w("ZipExportImportUtils", "Extracted image is empty: $originalFilename")
+                                    android.util.Log.w(
+                                            "ZipExportImportUtils",
+                                            "Extracted image is empty: $originalFilename"
+                                    )
                                 }
 
                                 // Clean up temp file
                                 tempFile.delete()
-                                
                             } catch (e: Exception) {
-                                android.util.Log.e("ZipExportImportUtils", "Failed to process image $originalFilename: ${e.message}")
+                                android.util.Log.e(
+                                        "ZipExportImportUtils",
+                                        "Failed to process image $originalFilename: ${e.message}"
+                                )
                             }
                         }
-                        
                         else -> {
-                            android.util.Log.d("ZipExportImportUtils", "Skipping ZIP entry: ${entry.name}")
+                            android.util.Log.d(
+                                    "ZipExportImportUtils",
+                                    "Skipping ZIP entry: ${entry.name}"
+                            )
                         }
                     }
 
@@ -276,30 +314,33 @@ object ZipExportImportUtils {
                 throw IOException("Invalid ZIP file: data.json is empty")
             }
 
-            android.util.Log.i("ZipExportImportUtils", "Import extraction completed: ${importedImagePaths.size} images processed")
+            android.util.Log.i(
+                    "ZipExportImportUtils",
+                    "Import extraction completed: ${importedImagePaths.size} images processed"
+            )
 
             return ImportResult(jsonContent, importedImagePaths)
-            
         } catch (e: Exception) {
             throw IOException("Failed to extract import ZIP: ${e.message}")
         }
     }
 
     /**
-     * Updates image paths in a problem list after import
+     * Updates image paths in a problem list after import This function maps the old image paths to
-     * This function maps the old image paths to the new ones after import
+     * the new ones after import
      */
     fun updateProblemImagePaths(
-        problems: List<com.atridad.openclimb.data.model.Problem>,
+            problems: List<BackupProblem>,
-        imagePathMapping: Map<String, String>
+            imagePathMapping: Map<String, String>
-    ): List<com.atridad.openclimb.data.model.Problem> {
+    ): List<BackupProblem> {
         return problems.map { problem ->
-            val updatedImagePaths = problem.imagePaths.mapNotNull { oldPath ->
+            val updatedImagePaths =
-                // Extract filename from the old path
+                    (problem.imagePaths ?: emptyList()).mapNotNull { oldPath ->
-                val filename = oldPath.substringAfterLast("/")
+                        // Extract filename from the old path
-                imagePathMapping[filename]
+                        val filename = oldPath.substringAfterLast("/")
-            }
+                        imagePathMapping[filename]
-            problem.copy(imagePaths = updatedImagePaths)
+                    }
+            problem.withUpdatedImagePaths(updatedImagePaths)
         }
     }
 }

android/test_backup/ClimbRepository.kt

@@ -0,0 +1,383 @@
+package com.atridad.openclimb.data.repository
+
+import android.content.Context
+import com.atridad.openclimb.data.database.OpenClimbDatabase
+import com.atridad.openclimb.data.format.ClimbDataBackup
+import com.atridad.openclimb.data.model.*
+import com.atridad.openclimb.utils.ZipExportImportUtils
+import java.io.File
+import java.time.LocalDateTime
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+import kotlinx.serialization.json.Json
+
+class ClimbRepository(database: OpenClimbDatabase, private val context: Context) {
+    private val gymDao = database.gymDao()
+    private val problemDao = database.problemDao()
+    private val sessionDao = database.climbSessionDao()
+    private val attemptDao = database.attemptDao()
+
+    private val json = Json {
+        prettyPrint = true
+        ignoreUnknownKeys = true
+    }
+
+    // Gym operations
+    fun getAllGyms(): Flow<List<Gym>> = gymDao.getAllGyms()
+    suspend fun getGymById(id: String): Gym? = gymDao.getGymById(id)
+    suspend fun insertGym(gym: Gym) = gymDao.insertGym(gym)
+    suspend fun updateGym(gym: Gym) = gymDao.updateGym(gym)
+    suspend fun deleteGym(gym: Gym) = gymDao.deleteGym(gym)
+    fun searchGyms(query: String): Flow<List<Gym>> = gymDao.searchGyms(query)
+
+    // Problem operations
+    fun getAllProblems(): Flow<List<Problem>> = problemDao.getAllProblems()
+    suspend fun getProblemById(id: String): Problem? = problemDao.getProblemById(id)
+    fun getProblemsByGym(gymId: String): Flow<List<Problem>> = problemDao.getProblemsByGym(gymId)
+    suspend fun insertProblem(problem: Problem) = problemDao.insertProblem(problem)
+    suspend fun updateProblem(problem: Problem) = problemDao.updateProblem(problem)
+    suspend fun deleteProblem(problem: Problem) = problemDao.deleteProblem(problem)
+    fun searchProblems(query: String): Flow<List<Problem>> = problemDao.searchProblems(query)
+
+    // Session operations
+    fun getAllSessions(): Flow<List<ClimbSession>> = sessionDao.getAllSessions()
+    suspend fun getSessionById(id: String): ClimbSession? = sessionDao.getSessionById(id)
+    fun getSessionsByGym(gymId: String): Flow<List<ClimbSession>> =
+            sessionDao.getSessionsByGym(gymId)
+    suspend fun getActiveSession(): ClimbSession? = sessionDao.getActiveSession()
+    fun getActiveSessionFlow(): Flow<ClimbSession?> = sessionDao.getActiveSessionFlow()
+    suspend fun insertSession(session: ClimbSession) = sessionDao.insertSession(session)
+    suspend fun updateSession(session: ClimbSession) = sessionDao.updateSession(session)
+    suspend fun deleteSession(session: ClimbSession) = sessionDao.deleteSession(session)
+    suspend fun getLastUsedGym(): Gym? {
+        val recentSessions = sessionDao.getRecentSessions(1).first()
+        return if (recentSessions.isNotEmpty()) {
+            getGymById(recentSessions.first().gymId)
+        } else {
+            null
+        }
+    }
+
+    // Attempt operations
+    fun getAllAttempts(): Flow<List<Attempt>> = attemptDao.getAllAttempts()
+    fun getAttemptsBySession(sessionId: String): Flow<List<Attempt>> =
+            attemptDao.getAttemptsBySession(sessionId)
+    fun getAttemptsByProblem(problemId: String): Flow<List<Attempt>> =
+            attemptDao.getAttemptsByProblem(problemId)
+    suspend fun insertAttempt(attempt: Attempt) = attemptDao.insertAttempt(attempt)
+    suspend fun updateAttempt(attempt: Attempt) = attemptDao.updateAttempt(attempt)
+    suspend fun deleteAttempt(attempt: Attempt) = attemptDao.deleteAttempt(attempt)
+
+    // ZIP Export with images - Single format for reliability
+    suspend fun exportAllDataToZip(directory: File? = null): File {
+        return try {
+            // Collect all data with proper error handling
+            val allGyms = gymDao.getAllGyms().first()
+            val allProblems = problemDao.getAllProblems().first()
+            val allSessions = sessionDao.getAllSessions().first()
+            val allAttempts = attemptDao.getAllAttempts().first()
+
+            // Validate data integrity before export
+            validateDataIntegrity(allGyms, allProblems, allSessions, allAttempts)
+
+            // Create backup data using platform-neutral format
+            val backupData =
+                    ClimbDataBackup(
+                            exportedAt = LocalDateTime.now().toString(),
+                            version = "2.0",
+                            formatVersion = "2.0",
+                            gyms =
+                                    allGyms.map {
+                                        com.atridad.openclimb.data.format.BackupGym.fromGym(it)
+                                    },
+                            problems =
+                                    allProblems.map {
+                                        com.atridad.openclimb.data.format.BackupProblem.fromProblem(
+                                                it
+                                        )
+                                    },
+                            sessions =
+                                    allSessions.map {
+                                        com.atridad.openclimb.data.format.BackupClimbSession
+                                                .fromClimbSession(it)
+                                    },
+                            attempts =
+                                    allAttempts.map {
+                                        com.atridad.openclimb.data.format.BackupAttempt.fromAttempt(
+                                                it
+                                        )
+                                    }
+                    )
+
+            // Collect all referenced image paths and validate they exist
+            val referencedImagePaths = allProblems.flatMap { it.imagePaths }.toSet()
+            val validImagePaths =
+                    referencedImagePaths
+                            .filter { imagePath ->
+                                try {
+                                    val imageFile =
+                                            com.atridad.openclimb.utils.ImageUtils.getImageFile(
+                                                    context,
+                                                    imagePath
+                                            )
+                                    imageFile.exists() && imageFile.length() > 0
+                                } catch (e: Exception) {
+                                    false
+                                }
+                            }
+                            .toSet()
+
+            // Log any missing images for debugging
+            val missingImages = referencedImagePaths - validImagePaths
+            if (missingImages.isNotEmpty()) {
+                android.util.Log.w(
+                        "ClimbRepository",
+                        "Some referenced images are missing: $missingImages"
+                )
+            }
+
+            ZipExportImportUtils.createExportZip(
+                    context = context,
+                    exportData = backupData,
+                    referencedImagePaths = validImagePaths,
+                    directory = directory
+            )
+        } catch (e: Exception) {
+            throw Exception("Export failed: ${e.message}")
+        }
+    }
+
+    suspend fun exportAllDataToZipUri(uri: android.net.Uri) {
+        try {
+            // Collect all data
+            val allGyms = gymDao.getAllGyms().first()
+            val allProblems = problemDao.getAllProblems().first()
+            val allSessions = sessionDao.getAllSessions().first()
+            val allAttempts = attemptDao.getAllAttempts().first()
+
+            // Validate data integrity before export
+            validateDataIntegrity(allGyms, allProblems, allSessions, allAttempts)
+
+            // Create backup data using platform-neutral format
+            val backupData =
+                    ClimbDataBackup(
+                            exportedAt = LocalDateTime.now().toString(),
+                            version = "2.0",
+                            formatVersion = "2.0",
+                            gyms =
+                                    allGyms.map {
+                                        com.atridad.openclimb.data.format.BackupGym.fromGym(it)
+                                    },
+                            problems =
+                                    allProblems.map {
+                                        com.atridad.openclimb.data.format.BackupProblem.fromProblem(
+                                                it
+                                        )
+                                    },
+                            sessions =
+                                    allSessions.map {
+                                        com.atridad.openclimb.data.format.BackupClimbSession
+                                                .fromClimbSession(it)
+                                    },
+                            attempts =
+                                    allAttempts.map {
+                                        com.atridad.openclimb.data.format.BackupAttempt.fromAttempt(
+                                                it
+                                        )
+                                    }
+                    )
+
+            // Collect all referenced image paths and validate they exist
+            val referencedImagePaths = allProblems.flatMap { it.imagePaths }.toSet()
+            val validImagePaths =
+                    referencedImagePaths
+                            .filter { imagePath ->
+                                try {
+                                    val imageFile =
+                                            com.atridad.openclimb.utils.ImageUtils.getImageFile(
+                                                    context,
+                                                    imagePath
+                                            )
+                                    imageFile.exists() && imageFile.length() > 0
+                                } catch (e: Exception) {
+                                    false
+                                }
+                            }
+                            .toSet()
+
+            ZipExportImportUtils.createExportZipToUri(
+                    context = context,
+                    uri = uri,
+                    exportData = backupData,
+                    referencedImagePaths = validImagePaths
+            )
+        } catch (e: Exception) {
+            throw Exception("Export failed: ${e.message}")
+        }
+    }
+
+    suspend fun importDataFromZip(file: File) {
+        try {
+            // Validate the ZIP file
+            if (!file.exists() || file.length() == 0L) {
+                throw Exception("Invalid ZIP file: file is empty or doesn't exist")
+            }
+
+            // Extract and validate the ZIP contents
+            val importResult = ZipExportImportUtils.extractImportZip(context, file)
+
+            // Validate JSON content
+            if (importResult.jsonContent.isBlank()) {
+                throw Exception("Invalid ZIP file: no data.json found or empty content")
+            }
+
+            // Parse and validate the data structure
+            val importData =
+                    try {
+                        json.decodeFromString<ClimbDataBackup>(importResult.jsonContent)
+                    } catch (e: Exception) {
+                        throw Exception("Invalid data format: ${e.message}")
+                    }
+
+            // Validate data integrity
+            validateImportData(importData)
+
+            // Clear existing data to avoid conflicts
+            attemptDao.deleteAllAttempts()
+            sessionDao.deleteAllSessions()
+            problemDao.deleteAllProblems()
+            gymDao.deleteAllGyms()
+
+            // Import gyms first (problems depend on gyms)
+            importData.gyms.forEach { backupGym ->
+                try {
+                    gymDao.insertGym(backupGym.toGym())
+                } catch (e: Exception) {
+                    throw Exception("Failed to import gym '${backupGym.name}': ${e.message}")
+                }
+            }
+
+            // Import problems with updated image paths
+            val updatedBackupProblems =
+                    ZipExportImportUtils.updateProblemImagePaths(
+                            importData.problems,
+                            importResult.importedImagePaths
+                    )
+
+            // Import problems (depends on gyms)
+            updatedBackupProblems.forEach { backupProblem ->
+                try {
+                    problemDao.insertProblem(backupProblem.toProblem())
+                } catch (e: Exception) {
+                    throw Exception(
+                            "Failed to import problem '${backupProblem.name}': ${e.message}"
+                    )
+                }
+            }
+
+            // Import sessions
+            importData.sessions.forEach { backupSession ->
+                try {
+                    sessionDao.insertSession(backupSession.toClimbSession())
+                } catch (e: Exception) {
+                    throw Exception("Failed to import session '${backupSession.id}': ${e.message}")
+                }
+            }
+
+            // Import attempts last (depends on problems and sessions)
+            importData.attempts.forEach { backupAttempt ->
+                try {
+                    attemptDao.insertAttempt(backupAttempt.toAttempt())
+                } catch (e: Exception) {
+                    throw Exception("Failed to import attempt '${backupAttempt.id}': ${e.message}")
+                }
+            }
+        } catch (e: Exception) {
+            throw Exception("Import failed: ${e.message}")
+        }
+    }
+
+    private fun validateDataIntegrity(
+            gyms: List<Gym>,
+            problems: List<Problem>,
+            sessions: List<ClimbSession>,
+            attempts: List<Attempt>
+    ) {
+        // Validate that all problems reference valid gyms
+        val gymIds = gyms.map { it.id }.toSet()
+        val invalidProblems = problems.filter { it.gymId !in gymIds }
+        if (invalidProblems.isNotEmpty()) {
+            throw Exception(
+                    "Data integrity error: ${invalidProblems.size} problems reference non-existent gyms"
+            )
+        }
+
+        // Validate that all sessions reference valid gyms
+        val invalidSessions = sessions.filter { it.gymId !in gymIds }
+        if (invalidSessions.isNotEmpty()) {
+            throw Exception(
+                    "Data integrity error: ${invalidSessions.size} sessions reference non-existent gyms"
+            )
+        }
+
+        // Validate that all attempts reference valid problems and sessions
+        val problemIds = problems.map { it.id }.toSet()
+        val sessionIds = sessions.map { it.id }.toSet()
+
+        val invalidAttempts =
+                attempts.filter { it.problemId !in problemIds || it.sessionId !in sessionIds }
+        if (invalidAttempts.isNotEmpty()) {
+            throw Exception(
+                    "Data integrity error: ${invalidAttempts.size} attempts reference non-existent problems or sessions"
+            )
+        }
+    }
+
+    private fun validateImportData(importData: ClimbDataBackup) {
+        if (importData.gyms.isEmpty()) {
+            throw Exception("Import data is invalid: no gyms found")
+        }
+
+        if (importData.version.isBlank()) {
+            throw Exception("Import data is invalid: no version information")
+        }
+
+        // Check for reasonable data sizes to prevent malicious imports
+        if (importData.gyms.size > 1000 ||
+                        importData.problems.size > 10000 ||
+                        importData.sessions.size > 10000 ||
+                        importData.attempts.size > 100000
+        ) {
+            throw Exception("Import data is too large: possible corruption or malicious file")
+        }
+    }
+
+    suspend fun resetAllData() {
+        try {
+            // Clear all data from database
+            attemptDao.deleteAllAttempts()
+            sessionDao.deleteAllSessions()
+            problemDao.deleteAllProblems()
+            gymDao.deleteAllGyms()
+
+            // Clear all images from storage
+            clearAllImages()
+        } catch (e: Exception) {
+            throw Exception("Reset failed: ${e.message}")
+        }
+    }
+
+    private fun clearAllImages() {
+        try {
+            // Get the images directory
+            val imagesDir = File(context.filesDir, "images")
+            if (imagesDir.exists() && imagesDir.isDirectory) {
+                val deletedCount = imagesDir.listFiles()?.size ?: 0
+                imagesDir.deleteRecursively()
+                android.util.Log.i("ClimbRepository", "Cleared $deletedCount image files")
+            }
+        } catch (e: Exception) {
+            android.util.Log.w("ClimbRepository", "Failed to clear some images: ${e.message}")
+        }
+    }
+}

ios/OpenClimb.xcodeproj/project.pbxproj

@@ -394,7 +394,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenClimb/OpenClimb.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -414,7 +414,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.OpenClimb;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -437,7 +437,7 @@
 				CODE_SIGN_ENTITLEMENTS = OpenClimb/OpenClimb.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -457,7 +457,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.OpenClimb;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -479,7 +479,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = SessionStatusLive/Info.plist;
@@ -490,7 +490,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.OpenClimb.SessionStatusLive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -509,7 +509,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 10;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = SessionStatusLive/Info.plist;
@@ -520,7 +520,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0.2;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.OpenClimb.SessionStatusLive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

ios/OpenClimb.xcodeproj/xcshareddata/xcschemes/SessionStatusLiveExtension.xcscheme

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2600"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D2FE948A2E78FEE0008CDB25"
+               BuildableName = "SessionStatusLiveExtension.appex"
+               BlueprintName = "SessionStatusLiveExtension"
+               ReferencedContainer = "container:OpenClimb.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D24C19672E75002A0045894C"
+               BuildableName = "OpenClimb.app"
+               BlueprintName = "OpenClimb"
+               ReferencedContainer = "container:OpenClimb.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D24C19672E75002A0045894C"
+            BuildableName = "OpenClimb.app"
+            BlueprintName = "OpenClimb"
+            ReferencedContainer = "container:OpenClimb.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "_XCWidgetKind"
+            value = ""
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetDefaultView"
+            value = "timeline"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetFamily"
+            value = "systemMedium"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D24C19672E75002A0045894C"
+            BuildableName = "OpenClimb.app"
+            BlueprintName = "OpenClimb"
+            ReferencedContainer = "container:OpenClimb.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

ios/OpenClimb.xcodeproj/xcuserdata/atridad.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,25 @@
 		<key>OpenClimb.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 		<key>SessionStatusLiveExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>D24C19672E75002A0045894C</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>D2FE948A2E78FEE0008CDB25</key>
+		<dict>
+			<key>primary</key>
+			<true/>
 		</dict>
 	</dict>
 </dict>

ios/OpenClimb/ContentView.swift

@@ -4,6 +4,7 @@ struct ContentView: View {
     @StateObject private var dataManager = ClimbingDataManager()
     @State private var selectedTab = 0
     @Environment(\.scenePhase) private var scenePhase
+    @State private var notificationObservers: [NSObjectProtocol] = []
 
     var body: some View {
         TabView(selection: $selectedTab) {
@@ -43,11 +44,23 @@ struct ContentView: View {
                 .tag(4)
         }
         .environmentObject(dataManager)
-        .onChange(of: scenePhase) {
+        .onChange(of: scenePhase) { oldPhase, newPhase in
-            if scenePhase == .active {
+            if newPhase == .active {
-                dataManager.onAppBecomeActive()
+                // Add slight delay to ensure app is fully loaded
+                Task {
+                    try? await Task.sleep(nanoseconds: 200_000_000)  // 0.2 seconds
+                    dataManager.onAppBecomeActive()
+                }
+            } else if newPhase == .background {
+                dataManager.onAppEnterBackground()
             }
         }
+        .onAppear {
+            setupNotificationObservers()
+        }
+        .onDisappear {
+            removeNotificationObservers()
+        }
         .overlay(alignment: .top) {
             if let message = dataManager.successMessage {
                 SuccessMessageView(message: message)
@@ -62,6 +75,44 @@ struct ContentView: View {
             }
         }
     }
+
+    private func setupNotificationObservers() {
+        // Listen for when the app will enter foreground
+        let willEnterForegroundObserver = NotificationCenter.default.addObserver(
+            forName: UIApplication.willEnterForegroundNotification,
+            object: nil,
+            queue: .main
+        ) { _ in
+            print("📱 App will enter foreground - preparing Live Activity check")
+            Task {
+                // Small delay to ensure app is fully active
+                try? await Task.sleep(nanoseconds: 800_000_000)  // 0.8 seconds
+                await dataManager.onAppBecomeActive()
+            }
+        }
+
+        // Listen for when the app becomes active
+        let didBecomeActiveObserver = NotificationCenter.default.addObserver(
+            forName: UIApplication.didBecomeActiveNotification,
+            object: nil,
+            queue: .main
+        ) { _ in
+            print("📱 App did become active - checking Live Activity status")
+            Task {
+                try? await Task.sleep(nanoseconds: 300_000_000)  // 0.3 seconds
+                await dataManager.onAppBecomeActive()
+            }
+        }
+
+        notificationObservers = [willEnterForegroundObserver, didBecomeActiveObserver]
+    }
+
+    private func removeNotificationObservers() {
+        for observer in notificationObservers {
+            NotificationCenter.default.removeObserver(observer)
+        }
+        notificationObservers.removeAll()
+    }
 }
 
 struct SuccessMessageView: View {

ios/OpenClimb/Models/BackupFormat.swift

@@ -0,0 +1,452 @@
+//
+//  BackupFormat.swift
+//  OpenClimb
+//
+//  Created by OpenClimb Team on 2024-12-19.
+//  Copyright © 2024 OpenClimb. All rights reserved.
+//
+
+import Foundation
+
+// MARK: - Backup Format Specification v2.0
+// Platform-neutral backup format for cross-platform compatibility
+// This format ensures portability between iOS and Android while maintaining
+// platform-specific implementations
+
+/// Root structure for OpenClimb backup data
+struct ClimbDataBackup: Codable {
+    let exportedAt: String
+    let version: String
+    let formatVersion: String
+    let gyms: [BackupGym]
+    let problems: [BackupProblem]
+    let sessions: [BackupClimbSession]
+    let attempts: [BackupAttempt]
+
+    init(
+        exportedAt: String,
+        version: String = "2.0",
+        formatVersion: String = "2.0",
+        gyms: [BackupGym],
+        problems: [BackupProblem],
+        sessions: [BackupClimbSession],
+        attempts: [BackupAttempt]
+    ) {
+        self.exportedAt = exportedAt
+        self.version = version
+        self.formatVersion = formatVersion
+        self.gyms = gyms
+        self.problems = problems
+        self.sessions = sessions
+        self.attempts = attempts
+    }
+}
+
+/// Platform-neutral gym representation for backup/restore
+struct BackupGym: Codable {
+    let id: String
+    let name: String
+    let location: String?
+    let supportedClimbTypes: [ClimbType]
+    let difficultySystems: [DifficultySystem]
+    let customDifficultyGrades: [String]
+    let notes: String?
+    let createdAt: String  // ISO 8601 format
+    let updatedAt: String  // ISO 8601 format
+
+    /// Initialize from native iOS Gym model
+    init(from gym: Gym) {
+        self.id = gym.id.uuidString
+        self.name = gym.name
+        self.location = gym.location
+        self.supportedClimbTypes = gym.supportedClimbTypes
+        self.difficultySystems = gym.difficultySystems
+        self.customDifficultyGrades = gym.customDifficultyGrades
+        self.notes = gym.notes
+
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+        self.createdAt = formatter.string(from: gym.createdAt)
+        self.updatedAt = formatter.string(from: gym.updatedAt)
+    }
+
+    /// Initialize with explicit parameters for import
+    init(
+        id: String,
+        name: String,
+        location: String?,
+        supportedClimbTypes: [ClimbType],
+        difficultySystems: [DifficultySystem],
+        customDifficultyGrades: [String] = [],
+        notes: String?,
+        createdAt: String,
+        updatedAt: String
+    ) {
+        self.id = id
+        self.name = name
+        self.location = location
+        self.supportedClimbTypes = supportedClimbTypes
+        self.difficultySystems = difficultySystems
+        self.customDifficultyGrades = customDifficultyGrades
+        self.notes = notes
+        self.createdAt = createdAt
+        self.updatedAt = updatedAt
+    }
+
+    /// Convert to native iOS Gym model
+    func toGym() throws -> Gym {
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+
+        guard let uuid = UUID(uuidString: id),
+            let createdDate = formatter.date(from: createdAt),
+            let updatedDate = formatter.date(from: updatedAt)
+        else {
+            throw BackupError.invalidDateFormat
+        }
+
+        return Gym.fromImport(
+            id: uuid,
+            name: name,
+            location: location,
+            supportedClimbTypes: supportedClimbTypes,
+            difficultySystems: difficultySystems,
+            customDifficultyGrades: customDifficultyGrades,
+            notes: notes,
+            createdAt: createdDate,
+            updatedAt: updatedDate
+        )
+    }
+}
+
+/// Platform-neutral problem representation for backup/restore
+struct BackupProblem: Codable {
+    let id: String
+    let gymId: String
+    let name: String?
+    let description: String?
+    let climbType: ClimbType
+    let difficulty: DifficultyGrade
+    let tags: [String]
+    let location: String?
+    let imagePaths: [String]?
+    let isActive: Bool
+    let dateSet: String?  // ISO 8601 format
+    let notes: String?
+    let createdAt: String  // ISO 8601 format
+    let updatedAt: String  // ISO 8601 format
+
+    /// Initialize from native iOS Problem model
+    init(from problem: Problem) {
+        self.id = problem.id.uuidString
+        self.gymId = problem.gymId.uuidString
+        self.name = problem.name
+        self.description = problem.description
+        self.climbType = problem.climbType
+        self.difficulty = problem.difficulty
+        self.tags = problem.tags
+        self.location = problem.location
+        self.imagePaths = problem.imagePaths.isEmpty ? nil : problem.imagePaths
+        self.isActive = problem.isActive
+        self.notes = problem.notes
+
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+        self.dateSet = problem.dateSet.map { formatter.string(from: $0) }
+        self.createdAt = formatter.string(from: problem.createdAt)
+        self.updatedAt = formatter.string(from: problem.updatedAt)
+    }
+
+    /// Initialize with explicit parameters for import
+    init(
+        id: String,
+        gymId: String,
+        name: String?,
+        description: String?,
+        climbType: ClimbType,
+        difficulty: DifficultyGrade,
+        tags: [String] = [],
+        location: String?,
+        imagePaths: [String]?,
+        isActive: Bool,
+        dateSet: String?,
+        notes: String?,
+        createdAt: String,
+        updatedAt: String
+    ) {
+        self.id = id
+        self.gymId = gymId
+        self.name = name
+        self.description = description
+        self.climbType = climbType
+        self.difficulty = difficulty
+        self.tags = tags
+        self.location = location
+        self.imagePaths = imagePaths
+        self.isActive = isActive
+        self.dateSet = dateSet
+        self.notes = notes
+        self.createdAt = createdAt
+        self.updatedAt = updatedAt
+    }
+
+    /// Convert to native iOS Problem model
+    func toProblem() throws -> Problem {
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+
+        guard let uuid = UUID(uuidString: id),
+            let gymUuid = UUID(uuidString: gymId),
+            let createdDate = formatter.date(from: createdAt),
+            let updatedDate = formatter.date(from: updatedAt)
+        else {
+            throw BackupError.invalidDateFormat
+        }
+
+        let dateSetDate = dateSet.flatMap { formatter.date(from: $0) }
+
+        return Problem.fromImport(
+            id: uuid,
+            gymId: gymUuid,
+            name: name,
+            description: description,
+            climbType: climbType,
+            difficulty: difficulty,
+            tags: tags,
+            location: location,
+            imagePaths: imagePaths ?? [],
+            isActive: isActive,
+            dateSet: dateSetDate,
+            notes: notes,
+            createdAt: createdDate,
+            updatedAt: updatedDate
+        )
+    }
+
+    /// Create a copy with updated image paths for import processing
+    func withUpdatedImagePaths(_ newImagePaths: [String]) -> BackupProblem {
+        return BackupProblem(
+            id: self.id,
+            gymId: self.gymId,
+            name: self.name,
+            description: self.description,
+            climbType: self.climbType,
+            difficulty: self.difficulty,
+            tags: self.tags,
+            location: self.location,
+            imagePaths: newImagePaths.isEmpty ? nil : newImagePaths,
+            isActive: self.isActive,
+            dateSet: self.dateSet,
+            notes: self.notes,
+            createdAt: self.createdAt,
+            updatedAt: self.updatedAt
+        )
+    }
+}
+
+/// Platform-neutral climb session representation for backup/restore
+struct BackupClimbSession: Codable {
+    let id: String
+    let gymId: String
+    let date: String  // ISO 8601 format
+    let startTime: String?  // ISO 8601 format
+    let endTime: String?  // ISO 8601 format
+    let duration: Int64?  // Duration in seconds
+    let status: SessionStatus
+    let notes: String?
+    let createdAt: String  // ISO 8601 format
+    let updatedAt: String  // ISO 8601 format
+
+    /// Initialize from native iOS ClimbSession model
+    init(from session: ClimbSession) {
+        self.id = session.id.uuidString
+        self.gymId = session.gymId.uuidString
+        self.status = session.status
+        self.notes = session.notes
+
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+        self.date = formatter.string(from: session.date)
+        self.startTime = session.startTime.map { formatter.string(from: $0) }
+        self.endTime = session.endTime.map { formatter.string(from: $0) }
+        self.duration = session.duration.map { Int64($0) }
+        self.createdAt = formatter.string(from: session.createdAt)
+        self.updatedAt = formatter.string(from: session.updatedAt)
+    }
+
+    /// Initialize with explicit parameters for import
+    init(
+        id: String,
+        gymId: String,
+        date: String,
+        startTime: String?,
+        endTime: String?,
+        duration: Int64?,
+        status: SessionStatus,
+        notes: String?,
+        createdAt: String,
+        updatedAt: String
+    ) {
+        self.id = id
+        self.gymId = gymId
+        self.date = date
+        self.startTime = startTime
+        self.endTime = endTime
+        self.duration = duration
+        self.status = status
+        self.notes = notes
+        self.createdAt = createdAt
+        self.updatedAt = updatedAt
+    }
+
+    /// Convert to native iOS ClimbSession model
+    func toClimbSession() throws -> ClimbSession {
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+
+        guard let uuid = UUID(uuidString: id),
+            let gymUuid = UUID(uuidString: gymId),
+            let dateValue = formatter.date(from: date),
+            let createdDate = formatter.date(from: createdAt),
+            let updatedDate = formatter.date(from: updatedAt)
+        else {
+            throw BackupError.invalidDateFormat
+        }
+
+        let startTimeValue = startTime.flatMap { formatter.date(from: $0) }
+        let endTimeValue = endTime.flatMap { formatter.date(from: $0) }
+        let durationValue = duration.map { Int($0) }
+
+        return ClimbSession.fromImport(
+            id: uuid,
+            gymId: gymUuid,
+            date: dateValue,
+            startTime: startTimeValue,
+            endTime: endTimeValue,
+            duration: durationValue,
+            status: status,
+            notes: notes,
+            createdAt: createdDate,
+            updatedAt: updatedDate
+        )
+    }
+}
+
+/// Platform-neutral attempt representation for backup/restore
+struct BackupAttempt: Codable {
+    let id: String
+    let sessionId: String
+    let problemId: String
+    let result: AttemptResult
+    let highestHold: String?
+    let notes: String?
+    let duration: Int64?  // Duration in seconds
+    let restTime: Int64?  // Rest time in seconds
+    let timestamp: String  // ISO 8601 format
+    let createdAt: String  // ISO 8601 format
+
+    /// Initialize from native iOS Attempt model
+    init(from attempt: Attempt) {
+        self.id = attempt.id.uuidString
+        self.sessionId = attempt.sessionId.uuidString
+        self.problemId = attempt.problemId.uuidString
+        self.result = attempt.result
+        self.highestHold = attempt.highestHold
+        self.notes = attempt.notes
+        self.duration = attempt.duration.map { Int64($0) }
+        self.restTime = attempt.restTime.map { Int64($0) }
+
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+        self.timestamp = formatter.string(from: attempt.timestamp)
+        self.createdAt = formatter.string(from: attempt.createdAt)
+    }
+
+    /// Initialize with explicit parameters for import
+    init(
+        id: String,
+        sessionId: String,
+        problemId: String,
+        result: AttemptResult,
+        highestHold: String?,
+        notes: String?,
+        duration: Int64?,
+        restTime: Int64?,
+        timestamp: String,
+        createdAt: String
+    ) {
+        self.id = id
+        self.sessionId = sessionId
+        self.problemId = problemId
+        self.result = result
+        self.highestHold = highestHold
+        self.notes = notes
+        self.duration = duration
+        self.restTime = restTime
+        self.timestamp = timestamp
+        self.createdAt = createdAt
+    }
+
+    /// Convert to native iOS Attempt model
+    func toAttempt() throws -> Attempt {
+        let formatter = ISO8601DateFormatter()
+        formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+
+        guard let uuid = UUID(uuidString: id),
+            let sessionUuid = UUID(uuidString: sessionId),
+            let problemUuid = UUID(uuidString: problemId),
+            let timestampDate = formatter.date(from: timestamp),
+            let createdDate = formatter.date(from: createdAt)
+        else {
+            throw BackupError.invalidDateFormat
+        }
+
+        let durationValue = duration.map { Int($0) }
+        let restTimeValue = restTime.map { Int($0) }
+
+        return Attempt.fromImport(
+            id: uuid,
+            sessionId: sessionUuid,
+            problemId: problemUuid,
+            result: result,
+            highestHold: highestHold,
+            notes: notes,
+            duration: durationValue,
+            restTime: restTimeValue,
+            timestamp: timestampDate,
+            createdAt: createdDate
+        )
+    }
+}
+
+// MARK: - Backup Format Errors
+
+enum BackupError: LocalizedError {
+    case invalidDateFormat
+    case invalidUUID
+    case missingRequiredField(String)
+    case unsupportedFormatVersion(String)
+
+    var errorDescription: String? {
+        switch self {
+        case .invalidDateFormat:
+            return "Invalid date format in backup data"
+        case .invalidUUID:
+            return "Invalid UUID format in backup data"
+        case .missingRequiredField(let field):
+            return "Missing required field: \(field)"
+        case .unsupportedFormatVersion(let version):
+            return "Unsupported backup format version: \(version)"
+        }
+    }
+}
+
+// MARK: - Extensions
+
+// MARK: - Helper Extensions for Optional Mapping
+
+extension Optional {
+    func map<T>(_ transform: (Wrapped) -> T) -> T? {
+        return self.flatMap { .some(transform($0)) }
+    }
+}

ios/OpenClimb/Models/DataModels.swift

@@ -260,7 +260,7 @@ struct Problem: Identifiable, Codable, Hashable {
     let description: String?
     let climbType: ClimbType
     let difficulty: DifficultyGrade
-    let setter: String?
+
     let tags: [String]
     let location: String?
     let imagePaths: [String]
@@ -272,7 +272,7 @@ struct Problem: Identifiable, Codable, Hashable {
 
     init(
         gymId: UUID, name: String? = nil, description: String? = nil, climbType: ClimbType,
-        difficulty: DifficultyGrade, setter: String? = nil, tags: [String] = [],
+        difficulty: DifficultyGrade, tags: [String] = [],
         location: String? = nil, imagePaths: [String] = [], dateSet: Date? = nil,
         notes: String? = nil
     ) {
@@ -282,7 +282,7 @@ struct Problem: Identifiable, Codable, Hashable {
         self.description = description
         self.climbType = climbType
         self.difficulty = difficulty
-        self.setter = setter
+
         self.tags = tags
         self.location = location
         self.imagePaths = imagePaths
@@ -296,7 +296,7 @@ struct Problem: Identifiable, Codable, Hashable {
 
     func updated(
         name: String? = nil, description: String? = nil, climbType: ClimbType? = nil,
-        difficulty: DifficultyGrade? = nil, setter: String? = nil, tags: [String]? = nil,
+        difficulty: DifficultyGrade? = nil, tags: [String]? = nil,
         location: String? = nil, imagePaths: [String]? = nil, isActive: Bool? = nil,
         dateSet: Date? = nil, notes: String? = nil
     ) -> Problem {
@@ -307,7 +307,7 @@ struct Problem: Identifiable, Codable, Hashable {
             description: description ?? self.description,
             climbType: climbType ?? self.climbType,
             difficulty: difficulty ?? self.difficulty,
-            setter: setter ?? self.setter,
+
             tags: tags ?? self.tags,
             location: location ?? self.location,
             imagePaths: imagePaths ?? self.imagePaths,
@@ -321,7 +321,7 @@ struct Problem: Identifiable, Codable, Hashable {
 
     private init(
         id: UUID, gymId: UUID, name: String?, description: String?, climbType: ClimbType,
-        difficulty: DifficultyGrade, setter: String?, tags: [String], location: String?,
+        difficulty: DifficultyGrade, tags: [String], location: String?,
         imagePaths: [String], isActive: Bool, dateSet: Date?, notes: String?, createdAt: Date,
         updatedAt: Date
     ) {
@@ -331,7 +331,7 @@ struct Problem: Identifiable, Codable, Hashable {
         self.description = description
         self.climbType = climbType
         self.difficulty = difficulty
-        self.setter = setter
+
         self.tags = tags
         self.location = location
         self.imagePaths = imagePaths
@@ -344,7 +344,7 @@ struct Problem: Identifiable, Codable, Hashable {
 
     static func fromImport(
         id: UUID, gymId: UUID, name: String?, description: String?, climbType: ClimbType,
-        difficulty: DifficultyGrade, setter: String?, tags: [String], location: String?,
+        difficulty: DifficultyGrade, tags: [String], location: String?,
         imagePaths: [String], isActive: Bool, dateSet: Date?, notes: String?, createdAt: Date,
         updatedAt: Date
     ) -> Problem {
@@ -355,7 +355,7 @@ struct Problem: Identifiable, Codable, Hashable {
             description: description,
             climbType: climbType,
             difficulty: difficulty,
-            setter: setter,
+
             tags: tags,
             location: location,
             imagePaths: imagePaths,

ios/OpenClimb/Utils/ImageManager.swift

@@ -1,4 +1,3 @@
-
 import Foundation
 import SwiftUI
 
@@ -522,7 +521,7 @@ class ImageManager {
         }
     }
 
-    private func getFullPath(from relativePath: String) -> String {
+    func getFullPath(from relativePath: String) -> String {
         // If it's already a full path, check if it's legacy and needs migration
         if relativePath.hasPrefix("/") {
             // If it's pointing to legacy Documents directory, redirect to new location

ios/OpenClimb/Utils/ZipUtils.swift

@@ -1,4 +1,3 @@
-
 import Compression
 import Foundation
 import zlib
@@ -10,7 +9,7 @@ struct ZipUtils {
     private static let METADATA_FILENAME = "metadata.txt"
 
     static func createExportZip(
-        exportData: ClimbDataExport,
+        exportData: ClimbDataBackup,
         referencedImagePaths: Set<String>
     ) throws -> Data {
 
@@ -196,7 +195,7 @@ struct ZipUtils {
     }
 
     private static func createMetadata(
-        exportData: ClimbDataExport,
+        exportData: ClimbDataBackup,
         referencedImagePaths: Set<String>
     ) -> String {
         return """

ios/OpenClimb/ViewModels/ClimbingDataManager.swift

@@ -7,6 +7,10 @@ import UniformTypeIdentifiers
     import WidgetKit
 #endif
 
+#if canImport(ActivityKit)
+    import ActivityKit
+#endif
+
 @MainActor
 class ClimbingDataManager: ObservableObject {
 
@@ -23,6 +27,7 @@ class ClimbingDataManager: ObservableObject {
     private let sharedUserDefaults = UserDefaults(suiteName: "group.com.atridad.OpenClimb")
     private let encoder = JSONEncoder()
     private let decoder = JSONDecoder()
+    private var liveActivityObserver: NSObjectProtocol?
 
     private enum Keys {
         static let gyms = "openclimb_gyms"
@@ -57,6 +62,7 @@ class ClimbingDataManager: ObservableObject {
         _ = ImageManager.shared
         loadAllData()
         migrateImagePaths()
+        setupLiveActivityNotifications()
 
         Task {
             try? await Task.sleep(nanoseconds: 2_000_000_000)
@@ -67,6 +73,12 @@ class ClimbingDataManager: ObservableObject {
         }
     }
 
+    deinit {
+        if let observer = liveActivityObserver {
+            NotificationCenter.default.removeObserver(observer)
+        }
+    }
+
     private func loadAllData() {
         loadGyms()
         loadProblems()
@@ -461,23 +473,33 @@ class ClimbingDataManager: ObservableObject {
             let dateFormatter = DateFormatter()
             dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
 
-            let exportData = ClimbDataExport(
+            let exportData = ClimbDataBackup(
                 exportedAt: dateFormatter.string(from: Date()),
-                gyms: gyms.map { AndroidGym(from: $0) },
+                version: "2.0",
-                problems: problems.map { AndroidProblem(from: $0) },
+                formatVersion: "2.0",
-                sessions: sessions.map { AndroidClimbSession(from: $0) },
+                gyms: gyms.map { BackupGym(from: $0) },
-                attempts: attempts.map { AndroidAttempt(from: $0) }
+                problems: problems.map { BackupProblem(from: $0) },
+                sessions: sessions.map { BackupClimbSession(from: $0) },
+                attempts: attempts.map { BackupAttempt(from: $0) }
             )
 
             // Collect referenced image paths
             let referencedImagePaths = collectReferencedImagePaths()
+            print("🎯 Starting export with \(referencedImagePaths.count) images")
 
-            return try ZipUtils.createExportZip(
+            let zipData = try ZipUtils.createExportZip(
                 exportData: exportData,
                 referencedImagePaths: referencedImagePaths
             )
+
+            print("✅ Export completed successfully")
+            successMessage = "Export completed with \(referencedImagePaths.count) images"
+            clearMessageAfterDelay()
+            return zipData
         } catch {
-            setError("Export failed: \(error.localizedDescription)")
+            let errorMessage = "Export failed: \(error.localizedDescription)"
+            print("❌ \(errorMessage)")
+            setError(errorMessage)
             return nil
         }
     }
@@ -508,7 +530,7 @@ class ClimbingDataManager: ObservableObject {
             print("Raw JSON content preview:")
             print(String(decoding: importResult.jsonData.prefix(500), as: UTF8.self) + "...")
 
-            let importData = try decoder.decode(ClimbDataExport.self, from: importResult.jsonData)
+            let importData = try decoder.decode(ClimbDataBackup.self, from: importResult.jsonData)
 
             print("Successfully decoded import data:")
             print("- Gyms: \(importData.gyms.count)")
@@ -525,10 +547,10 @@ class ClimbingDataManager: ObservableObject {
                 imagePathMapping: importResult.imagePathMapping
             )
 
-            self.gyms = importData.gyms.map { $0.toGym() }
+            self.gyms = try importData.gyms.map { try $0.toGym() }
-            self.problems = updatedProblems.map { $0.toProblem() }
+            self.problems = try updatedProblems.map { try $0.toProblem() }
-            self.sessions = importData.sessions.map { $0.toClimbSession() }
+            self.sessions = try importData.sessions.map { try $0.toClimbSession() }
-            self.attempts = importData.attempts.map { $0.toAttempt() }
+            self.attempts = try importData.attempts.map { try $0.toAttempt() }
 
             saveGyms()
             saveProblems()
@@ -563,317 +585,43 @@ class ClimbingDataManager: ObservableObject {
     }
 }
 
-struct ClimbDataExport: Codable {
-    let exportedAt: String
-    let gyms: [AndroidGym]
-    let problems: [AndroidProblem]
-    let sessions: [AndroidClimbSession]
-    let attempts: [AndroidAttempt]
-
-    init(
-        exportedAt: String, gyms: [AndroidGym], problems: [AndroidProblem],
-        sessions: [AndroidClimbSession], attempts: [AndroidAttempt]
-    ) {
-        self.exportedAt = exportedAt
-        self.gyms = gyms
-        self.problems = problems
-        self.sessions = sessions
-        self.attempts = attempts
-    }
-}
-
-struct AndroidGym: Codable {
-    let id: String
-    let name: String
-    let location: String?
-    let supportedClimbTypes: [ClimbType]
-    let difficultySystems: [DifficultySystem]
-    let notes: String?
-    let createdAt: String
-    let updatedAt: String
-
-    init(from gym: Gym) {
-        self.id = gym.id.uuidString
-        self.name = gym.name
-        self.location = gym.location
-        self.supportedClimbTypes = gym.supportedClimbTypes
-        self.difficultySystems = gym.difficultySystems
-        self.notes = gym.notes
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
-        self.createdAt = formatter.string(from: gym.createdAt)
-        self.updatedAt = formatter.string(from: gym.updatedAt)
-    }
-
-    init(
-        id: String, name: String, location: String?, supportedClimbTypes: [ClimbType],
-        difficultySystems: [DifficultySystem], notes: String?, createdAt: String, updatedAt: String
-    ) {
-        self.id = id
-        self.name = name
-        self.location = location
-        self.supportedClimbTypes = supportedClimbTypes
-        self.difficultySystems = difficultySystems
-        self.notes = notes
-        self.createdAt = createdAt
-        self.updatedAt = updatedAt
-    }
-
-    func toGym() -> Gym {
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
-
-        let gymId = UUID(uuidString: id) ?? UUID()
-        let createdDate = formatter.date(from: createdAt) ?? Date()
-        let updatedDate = formatter.date(from: updatedAt) ?? Date()
-
-        return Gym.fromImport(
-            id: gymId,
-            name: name,
-            location: location,
-            supportedClimbTypes: supportedClimbTypes,
-            difficultySystems: difficultySystems,
-            customDifficultyGrades: [],
-            notes: notes,
-            createdAt: createdDate,
-            updatedAt: updatedDate
-        )
-    }
-}
-
-struct AndroidProblem: Codable {
-    let id: String
-    let gymId: String
-    let name: String?
-    let description: String?
-    let climbType: ClimbType
-    let difficulty: DifficultyGrade
-    let imagePaths: [String]?
-    let createdAt: String
-    let updatedAt: String
-
-    init(from problem: Problem) {
-        self.id = problem.id.uuidString
-        self.gymId = problem.gymId.uuidString
-        self.name = problem.name
-        self.description = problem.description
-        self.climbType = problem.climbType
-        self.difficulty = problem.difficulty
-        self.imagePaths = problem.imagePaths.isEmpty ? nil : problem.imagePaths
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
-        self.createdAt = formatter.string(from: problem.createdAt)
-        self.updatedAt = formatter.string(from: problem.updatedAt)
-    }
-
-    init(
-        id: String, gymId: String, name: String?, description: String?, climbType: ClimbType,
-        difficulty: DifficultyGrade, imagePaths: [String]?, createdAt: String, updatedAt: String
-    ) {
-        self.id = id
-        self.gymId = gymId
-        self.name = name
-        self.description = description
-        self.climbType = climbType
-        self.difficulty = difficulty
-        self.imagePaths = imagePaths
-        self.createdAt = createdAt
-        self.updatedAt = updatedAt
-    }
-
-    func toProblem() -> Problem {
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
-
-        let problemId = UUID(uuidString: id) ?? UUID()
-        let preservedGymId = UUID(uuidString: gymId) ?? UUID()
-        let createdDate = formatter.date(from: createdAt) ?? Date()
-        let updatedDate = formatter.date(from: updatedAt) ?? Date()
-
-        return Problem.fromImport(
-            id: problemId,
-            gymId: preservedGymId,
-            name: name,
-            description: description,
-            climbType: climbType,
-            difficulty: difficulty,
-            setter: nil,
-            tags: [],
-            location: nil,
-            imagePaths: imagePaths ?? [],
-            isActive: true,
-            dateSet: nil,
-            notes: nil,
-            createdAt: createdDate,
-            updatedAt: updatedDate
-        )
-    }
-
-    func withUpdatedImagePaths(_ newImagePaths: [String]) -> AndroidProblem {
-        return AndroidProblem(
-            id: self.id,
-            gymId: self.gymId,
-            name: self.name,
-            description: self.description,
-            climbType: self.climbType,
-            difficulty: self.difficulty,
-            imagePaths: newImagePaths.isEmpty ? nil : newImagePaths,
-            createdAt: self.createdAt,
-            updatedAt: self.updatedAt
-        )
-    }
-}
-
-struct AndroidClimbSession: Codable {
-    let id: String
-    let gymId: String
-    let date: String
-    let startTime: String?
-    let endTime: String?
-    let duration: Int?
-    let status: SessionStatus
-    let createdAt: String
-    let updatedAt: String
-
-    init(from session: ClimbSession) {
-        self.id = session.id.uuidString
-        self.gymId = session.gymId.uuidString
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
-        self.date = formatter.string(from: session.date)
-        self.startTime = session.startTime != nil ? formatter.string(from: session.startTime!) : nil
-        self.endTime = session.endTime != nil ? formatter.string(from: session.endTime!) : nil
-        self.duration = session.duration
-        self.status = session.status
-        self.createdAt = formatter.string(from: session.createdAt)
-        self.updatedAt = formatter.string(from: session.updatedAt)
-    }
-
-    init(
-        id: String, gymId: String, date: String, startTime: String?, endTime: String?,
-        duration: Int?, status: SessionStatus, createdAt: String, updatedAt: String
-    ) {
-        self.id = id
-        self.gymId = gymId
-        self.date = date
-        self.startTime = startTime
-        self.endTime = endTime
-        self.duration = duration
-        self.status = status
-        self.createdAt = createdAt
-        self.updatedAt = updatedAt
-    }
-
-    func toClimbSession() -> ClimbSession {
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
-
-        // Preserve original IDs and dates
-        let sessionId = UUID(uuidString: id) ?? UUID()
-        let preservedGymId = UUID(uuidString: gymId) ?? UUID()
-        let sessionDate = formatter.date(from: date) ?? Date()
-        let sessionStartTime = startTime != nil ? formatter.date(from: startTime!) : nil
-        let sessionEndTime = endTime != nil ? formatter.date(from: endTime!) : nil
-        let createdDate = formatter.date(from: createdAt) ?? Date()
-        let updatedDate = formatter.date(from: updatedAt) ?? Date()
-
-        return ClimbSession.fromImport(
-            id: sessionId,
-            gymId: preservedGymId,
-            date: sessionDate,
-            startTime: sessionStartTime,
-            endTime: sessionEndTime,
-            duration: duration,
-            status: status,
-            notes: nil,
-            createdAt: createdDate,
-            updatedAt: updatedDate
-        )
-    }
-}
-
-struct AndroidAttempt: Codable {
-    let id: String
-    let sessionId: String
-    let problemId: String
-    let result: AttemptResult
-    let highestHold: String?
-    let notes: String?
-    let duration: Int?
-    let restTime: Int?
-    let timestamp: String
-    let createdAt: String
-
-    init(from attempt: Attempt) {
-        self.id = attempt.id.uuidString
-        self.sessionId = attempt.sessionId.uuidString
-        self.problemId = attempt.problemId.uuidString
-        self.result = attempt.result
-        self.highestHold = attempt.highestHold
-        self.notes = attempt.notes
-        self.duration = attempt.duration
-        self.restTime = attempt.restTime
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
-        self.timestamp = formatter.string(from: attempt.timestamp)
-        self.createdAt = formatter.string(from: attempt.createdAt)
-    }
-
-    init(
-        id: String, sessionId: String, problemId: String, result: AttemptResult,
-        highestHold: String?, notes: String?, duration: Int?, restTime: Int?,
-        timestamp: String, createdAt: String
-    ) {
-        self.id = id
-        self.sessionId = sessionId
-        self.problemId = problemId
-        self.result = result
-        self.highestHold = highestHold
-        self.notes = notes
-        self.duration = duration
-        self.restTime = restTime
-        self.timestamp = timestamp
-        self.createdAt = createdAt
-    }
-
-    func toAttempt() -> Attempt {
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS"
-
-        let attemptId = UUID(uuidString: id) ?? UUID()
-        let preservedSessionId = UUID(uuidString: sessionId) ?? UUID()
-        let preservedProblemId = UUID(uuidString: problemId) ?? UUID()
-        let attemptTimestamp = formatter.date(from: timestamp) ?? Date()
-        let createdDate = formatter.date(from: createdAt) ?? Date()
-
-        return Attempt.fromImport(
-            id: attemptId,
-            sessionId: preservedSessionId,
-            problemId: preservedProblemId,
-            result: result,
-            highestHold: highestHold,
-            notes: notes,
-            duration: duration,
-            restTime: restTime,
-            timestamp: attemptTimestamp,
-            createdAt: createdDate
-        )
-    }
-}
-
 extension ClimbingDataManager {
     private func collectReferencedImagePaths() -> Set<String> {
         var imagePaths = Set<String>()
+        print("🖼️ Starting image path collection...")
+        print("📊 Total problems: \(problems.count)")
+
         for problem in problems {
-            imagePaths.formUnion(problem.imagePaths)
+            if !problem.imagePaths.isEmpty {
+                print(
+                    "📸 Problem '\(problem.name ?? "Unnamed")' has \(problem.imagePaths.count) images"
+                )
+                for imagePath in problem.imagePaths {
+                    print("   - Relative path: \(imagePath)")
+                    let fullPath = ImageManager.shared.getFullPath(from: imagePath)
+                    print("   - Full path: \(fullPath)")
+
+                    // Check if file exists
+                    if FileManager.default.fileExists(atPath: fullPath) {
+                        print("   ✅ File exists")
+                        imagePaths.insert(fullPath)
+                    } else {
+                        print("   ❌ File does NOT exist")
+                        // Still add it to let ZipUtils handle the error logging
+                        imagePaths.insert(fullPath)
+                    }
+                }
+            }
         }
+
+        print("🖼️ Collected \(imagePaths.count) total image paths for export")
         return imagePaths
     }
 
     private func updateProblemImagePaths(
-        problems: [AndroidProblem],
+        problems: [BackupProblem],
         imagePathMapping: [String: String]
-    ) -> [AndroidProblem] {
+    ) -> [BackupProblem] {
         return problems.map { problem in
             let updatedImagePaths = (problem.imagePaths ?? []).compactMap { oldPath in
                 let fileName = URL(fileURLWithPath: oldPath).lastPathComponent
@@ -1046,23 +794,111 @@ extension ClimbingDataManager {
     }
 
     private func checkAndRestartLiveActivity() async {
-        guard let activeSession = activeSession else { return }
+        guard let activeSession = activeSession else {
+            // No active session, make sure all Live Activities are cleaned up
+            await LiveActivityManager.shared.endLiveActivity()
+            return
+        }
+
+        // Only restart if session is actually active
+        guard activeSession.status == .active else {
+            print(
+                "⚠️ Session exists but is not active (status: \(activeSession.status)), ending Live Activity"
+            )
+            await LiveActivityManager.shared.endLiveActivity()
+            return
+        }
 
         if let gym = gym(withId: activeSession.gymId) {
+            print("🔍 Checking Live Activity for active session at \(gym.name)")
+
+            // First cleanup any dismissed activities
+            await LiveActivityManager.shared.cleanupDismissedActivities()
+
+            // Then attempt to restart if needed
             await LiveActivityManager.shared.restartLiveActivityIfNeeded(
                 activeSession: activeSession,
                 gymName: gym.name
             )
+
+            // Update with current session data
+            await updateLiveActivityData()
         }
     }
 
     /// Call this when app becomes active to check for Live Activity restart
     func onAppBecomeActive() {
+        print("📱 App became active - checking Live Activity status")
         Task {
             await checkAndRestartLiveActivity()
         }
     }
 
+    /// Call this when app enters background to update Live Activity
+    func onAppEnterBackground() {
+        print("📱 App entering background - updating Live Activity if needed")
+        Task {
+            await updateLiveActivityData()
+        }
+    }
+
+    /// Setup notifications for Live Activity events
+    private func setupLiveActivityNotifications() {
+        liveActivityObserver = NotificationCenter.default.addObserver(
+            forName: .liveActivityDismissed,
+            object: nil,
+            queue: .main
+        ) { [weak self] _ in
+            print("🔔 Received Live Activity dismissed notification - attempting restart")
+            Task { @MainActor in
+                await self?.handleLiveActivityDismissed()
+            }
+        }
+    }
+
+    /// Handle Live Activity being dismissed by user
+    private func handleLiveActivityDismissed() async {
+        guard let activeSession = activeSession,
+            activeSession.status == .active,
+            let gym = gym(withId: activeSession.gymId)
+        else {
+            return
+        }
+
+        print("🔄 Attempting to restart dismissed Live Activity for \(gym.name)")
+
+        // Wait a bit before restarting to avoid frequency limits
+        try? await Task.sleep(nanoseconds: 2_000_000_000)  // 2 seconds
+
+        await LiveActivityManager.shared.startLiveActivity(
+            for: activeSession,
+            gymName: gym.name
+        )
+
+        // Update with current data
+        await updateLiveActivityData()
+    }
+
+    /// Update Live Activity with current session statistics
+    private func updateLiveActivityData() async {
+        guard let activeSession = activeSession,
+            activeSession.status == .active
+        else { return }
+
+        let elapsed = Date().timeIntervalSince(activeSession.startTime ?? activeSession.date)
+        let sessionAttempts = attempts.filter { $0.sessionId == activeSession.id }
+        let totalAttempts = sessionAttempts.count
+        let completedProblems = Set(
+            sessionAttempts.filter { $0.result.isSuccessful }.map { $0.problemId }
+        ).count
+
+        await LiveActivityManager.shared.updateLiveActivity(
+            elapsed: elapsed,
+            totalAttempts: totalAttempts,
+            completedProblems: completedProblems
+        )
+    }
+
     /// Update Live Activity with current session data
     private func updateLiveActivityForActiveSession() {
         guard let activeSession = activeSession,
@@ -1132,7 +968,7 @@ extension ClimbingDataManager {
         saveAttempts()
     }
 
-    private func validateImportData(_ importData: ClimbDataExport) throws {
+    private func validateImportData(_ importData: ClimbDataBackup) throws {
         if importData.gyms.isEmpty {
             throw NSError(
                 domain: "ImportError", code: 1,
@@ -1160,7 +996,6 @@ extension ClimbingDataManager {
             description: "Technical overhang with small holds",
             climbType: .boulder,
             difficulty: DifficultyGrade(system: .vScale, grade: "V4"),
-            setter: "John Doe",
             tags: ["technical", "overhang"],
             location: "Cave area"
         )

ios/OpenClimb/ViewModels/LiveActivityManager.swift

@@ -1,12 +1,22 @@
 import ActivityKit
 import Foundation
 
+extension Notification.Name {
+    static let liveActivityDismissed = Notification.Name("liveActivityDismissed")
+}
+
 @MainActor
 final class LiveActivityManager {
     static let shared = LiveActivityManager()
     private init() {}
 
     private var currentActivity: Activity<SessionActivityAttributes>?
+    private var healthCheckTimer: Timer?
+    private var lastHealthCheck: Date = Date()
+
+    deinit {
+        healthCheckTimer?.invalidate()
+    }
 
     /// Check if there's an active session and restart Live Activity if needed
     func restartLiveActivityIfNeeded(activeSession: ClimbSession?, gymName: String?) async {
@@ -18,13 +28,31 @@ final class LiveActivityManager {
             return
         }
 
-        // Check if we already have a running Live Activity
+        // Check if we have a tracked Live Activity that's still actually running
-        if currentActivity != nil {
+        if let currentActivity = currentActivity {
-            print("ℹ️ Live Activity already running")
+            let activities = Activity<SessionActivityAttributes>.activities
+            let isStillActive = activities.contains { $0.id == currentActivity.id }
+
+            if isStillActive {
+                print("ℹ️ Live Activity still running: \(currentActivity.id)")
+                return
+            } else {
+                print(
+                    "⚠️ Tracked Live Activity \(currentActivity.id) was dismissed, clearing reference"
+                )
+                self.currentActivity = nil
+            }
+        }
+
+        // Check if there are ANY active Live Activities for this session
+        let existingActivities = Activity<SessionActivityAttributes>.activities
+        if let existingActivity = existingActivities.first {
+            print("ℹ️ Found existing Live Activity: \(existingActivity.id), using it")
+            self.currentActivity = existingActivity
             return
         }
 
-        print("🔄 Restarting Live Activity for existing session")
+        print("🔄 No Live Activity found, restarting for existing session")
         await startLiveActivity(for: activeSession, gymName: gymName)
     }
 
@@ -34,10 +62,17 @@ final class LiveActivityManager {
 
         await endLiveActivity()
 
+        // Start health checks once we have an active session
+        startHealthChecks()
+
+        // Calculate elapsed time if session already started
+        let startTime = session.startTime ?? session.date
+        let elapsed = Date().timeIntervalSince(startTime)
+
         let attributes = SessionActivityAttributes(
-            gymName: gymName, startTime: session.startTime ?? session.date)
+            gymName: gymName, startTime: startTime)
         let initialContentState = SessionActivityAttributes.ContentState(
-            elapsed: 0,
+            elapsed: elapsed,
             totalAttempts: 0,
             completedProblems: 0
         )
@@ -59,6 +94,8 @@ final class LiveActivityManager {
                 print("Authorization error - check Live Activity permissions in Settings")
             } else if error.localizedDescription.contains("content") {
                 print("Content error - check ActivityAttributes structure")
+            } else if error.localizedDescription.contains("frequencyLimited") {
+                print("Frequency limited - too many Live Activities started recently")
             }
         }
     }
@@ -66,11 +103,23 @@ final class LiveActivityManager {
     /// Call this to update the Live Activity with new session progress
     func updateLiveActivity(elapsed: TimeInterval, totalAttempts: Int, completedProblems: Int) async
     {
-        guard let currentActivity else {
+        guard let currentActivity = currentActivity else {
             print("⚠️ No current activity to update")
             return
         }
 
+        // Verify the activity is still valid before updating
+        let activities = Activity<SessionActivityAttributes>.activities
+        let isStillActive = activities.contains { $0.id == currentActivity.id }
+
+        if !isStillActive {
+            print(
+                "⚠️ Tracked Live Activity \(currentActivity.id) is no longer active, clearing reference"
+            )
+            self.currentActivity = nil
+            return
+        }
+
         print(
             "🔄 Updating Live Activity - Attempts: \(totalAttempts), Completed: \(completedProblems)"
         )
@@ -87,6 +136,9 @@ final class LiveActivityManager {
 
     /// Call this when a ClimbSession ends to end the Live Activity
     func endLiveActivity() async {
+        // Stop health checks first
+        stopHealthChecks()
+
         // First end the tracked activity if it exists
         if let currentActivity {
             print("🔴 Ending tracked Live Activity: \(currentActivity.id)")
@@ -115,18 +167,92 @@ final class LiveActivityManager {
     func checkLiveActivityAvailability() -> String {
         let authorizationInfo = ActivityAuthorizationInfo()
         let status = authorizationInfo.areActivitiesEnabled
+        let allActivities = Activity<SessionActivityAttributes>.activities
 
         let message = """
             Live Activity Status:
             • Enabled: \(status)
             • Authorization: \(authorizationInfo.areActivitiesEnabled ? "Granted" : "Denied/Unknown")
-            • Current Activity: \(currentActivity?.id.description ?? "None")
+            • Tracked Activity: \(currentActivity?.id.description ?? "None")
+            • All Active Activities: \(allActivities.count)
             """
 
         print(message)
         return message
     }
 
+    /// Force check and cleanup dismissed Live Activities
+    func cleanupDismissedActivities() async {
+        let activities = Activity<SessionActivityAttributes>.activities
+
+        if let currentActivity = currentActivity {
+            let isStillActive = activities.contains { $0.id == currentActivity.id }
+            if !isStillActive {
+                print("🧹 Cleaning up dismissed Live Activity: \(currentActivity.id)")
+                self.currentActivity = nil
+            }
+        }
+    }
+
+    /// Start periodic health checks for Live Activity
+    func startHealthChecks() {
+        stopHealthChecks()  // Stop any existing timer
+
+        print("🩺 Starting Live Activity health checks")
+        healthCheckTimer = Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) {
+            [weak self] _ in
+            Task { @MainActor in
+                await self?.performHealthCheck()
+            }
+        }
+    }
+
+    /// Stop periodic health checks
+    func stopHealthChecks() {
+        healthCheckTimer?.invalidate()
+        healthCheckTimer = nil
+        print("🛑 Stopped Live Activity health checks")
+    }
+
+    /// Perform a health check on the current Live Activity
+    private func performHealthCheck() async {
+        guard let currentActivity = currentActivity else { return }
+
+        let now = Date()
+        let timeSinceLastCheck = now.timeIntervalSince(lastHealthCheck)
+
+        // Only perform health check if it's been at least 25 seconds
+        guard timeSinceLastCheck >= 25 else { return }
+
+        print("🩺 Performing Live Activity health check")
+        lastHealthCheck = now
+
+        let activities = Activity<SessionActivityAttributes>.activities
+        let isStillActive = activities.contains { $0.id == currentActivity.id }
+
+        if !isStillActive {
+            print("💔 Health check failed - Live Activity was dismissed")
+            self.currentActivity = nil
+
+            // Notify that we need to restart
+            NotificationCenter.default.post(
+                name: .liveActivityDismissed,
+                object: nil
+            )
+        } else {
+            print("✅ Live Activity health check passed")
+        }
+    }
+
+    /// Get the current activity status for debugging
+    func getCurrentActivityStatus() -> String {
+        let activities = Activity<SessionActivityAttributes>.activities
+        let trackedStatus = currentActivity != nil ? "Tracked" : "None"
+        let actualCount = activities.count
+
+        return "Status: \(trackedStatus) | Active Count: \(actualCount)"
+    }
+
     /// Start periodic updates for Live Activity
     func startPeriodicUpdates(for session: ClimbSession, totalAttempts: Int, completedProblems: Int)
     {

ios/OpenClimb/Views/AddEdit/AddAttemptView.swift

@@ -635,12 +635,6 @@ struct ProblemExpandedView: View {
                                 .foregroundColor(.secondary)
                         }
 
-                        if let setter = problem.setter, !setter.isEmpty {
-                            Label(setter, systemImage: "person")
-                                .font(.subheadline)
-                                .foregroundColor(.secondary)
-                        }
-
                         if let description = problem.description, !description.isEmpty {
                             Text(description)
                                 .font(.body)

ios/OpenClimb/Views/AddEdit/AddEditProblemView.swift

@@ -13,7 +13,6 @@ struct AddEditProblemView: View {
     @State private var selectedClimbType: ClimbType = .boulder
     @State private var selectedDifficultySystem: DifficultySystem = .vScale
     @State private var difficultyGrade = ""
-    @State private var setter = ""
     @State private var location = ""
     @State private var tags = ""
     @State private var notes = ""
@@ -63,7 +62,7 @@ struct AddEditProblemView: View {
                 PhotosSection()
                 ClimbTypeSection()
                 DifficultySection()
-                LocationAndSetterSection()
+                LocationSection()
                 TagsSection()
                 AdditionalInfoSection()
             }
@@ -158,7 +157,6 @@ struct AddEditProblemView: View {
                     )
             }
 
-            TextField("Route Setter (Optional)", text: $setter)
         }
     }
 
@@ -281,7 +279,7 @@ struct AddEditProblemView: View {
     }
 
     @ViewBuilder
-    private func LocationAndSetterSection() -> some View {
+    private func LocationSection() -> some View {
         Section("Location & Details") {
             TextField(
                 "Location (Optional)", text: $location, prompt: Text("e.g., 'Cave area', 'Wall 3'"))
@@ -334,25 +332,28 @@ struct AddEditProblemView: View {
                     HStack(spacing: 12) {
                         ForEach(imageData.indices, id: \.self) { index in
                             if let uiImage = UIImage(data: imageData[index]) {
-                                Image(uiImage: uiImage)
+                                ZStack(alignment: .topTrailing) {
-                                    .resizable()
+                                    Image(uiImage: uiImage)
-                                    .aspectRatio(contentMode: .fill)
+                                        .resizable()
-                                    .frame(width: 80, height: 80)
+                                        .aspectRatio(contentMode: .fill)
-                                    .clipped()
+                                        .frame(width: 80, height: 80)
-                                    .cornerRadius(8)
+                                        .clipped()
-                                    .overlay(alignment: .topTrailing) {
+                                        .cornerRadius(8)
-                                        Button(action: {
+
-                                            imageData.remove(at: index)
+                                    Button(action: {
-                                            if index < imagePaths.count {
+                                        imageData.remove(at: index)
-                                                imagePaths.remove(at: index)
+                                        if index < imagePaths.count {
-                                            }
+                                            imagePaths.remove(at: index)
-                                        }) {
-                                            Image(systemName: "xmark.circle.fill")
-                                                .foregroundColor(.red)
-                                                .background(Circle().fill(.white))
                                         }
-                                        .offset(x: 8, y: -8)
+                                    }) {
+                                        Image(systemName: "xmark.circle.fill")
+                                            .foregroundColor(.red)
+                                            .background(Circle().fill(.white))
+                                            .font(.system(size: 18))
                                     }
+                                    .offset(x: 4, y: -4)
+                                }
+                                .frame(width: 88, height: 88)  // Extra space for button
                             } else {
                                 RoundedRectangle(cornerRadius: 8)
                                     .fill(.gray.opacity(0.3))
@@ -365,6 +366,7 @@ struct AddEditProblemView: View {
                         }
                     }
                     .padding(.horizontal, 1)
+                    .padding(.vertical, 8)
                 }
             }
         }
@@ -410,7 +412,7 @@ struct AddEditProblemView: View {
             selectedClimbType = problem.climbType
             selectedDifficultySystem = problem.difficulty.system
             difficultyGrade = problem.difficulty.grade
-            setter = problem.setter ?? ""
+
             location = problem.location ?? ""
             tags = problem.tags.joined(separator: ", ")
             notes = problem.notes ?? ""
@@ -420,7 +422,7 @@ struct AddEditProblemView: View {
             // Load image data for preview
             imageData = []
             for imagePath in problem.imagePaths {
-                if let data = try? Data(contentsOf: URL(fileURLWithPath: imagePath)) {
+                if let data = ImageManager.shared.loadImageData(fromPath: imagePath) {
                     imageData.append(data)
                 }
             }
@@ -479,7 +481,7 @@ struct AddEditProblemView: View {
 
         let trimmedName = name.trimmingCharacters(in: .whitespacesAndNewlines)
         let trimmedDescription = description.trimmingCharacters(in: .whitespacesAndNewlines)
-        let trimmedSetter = setter.trimmingCharacters(in: .whitespacesAndNewlines)
+
         let trimmedLocation = location.trimmingCharacters(in: .whitespacesAndNewlines)
         let trimmedNotes = notes.trimmingCharacters(in: .whitespacesAndNewlines)
         let trimmedTags = tags.split(separator: ",").map {
@@ -494,7 +496,7 @@ struct AddEditProblemView: View {
                 description: trimmedDescription.isEmpty ? nil : trimmedDescription,
                 climbType: selectedClimbType,
                 difficulty: difficulty,
-                setter: trimmedSetter.isEmpty ? nil : trimmedSetter,
+
                 tags: trimmedTags,
                 location: trimmedLocation.isEmpty ? nil : trimmedLocation,
                 imagePaths: imagePaths,
@@ -510,7 +512,7 @@ struct AddEditProblemView: View {
                 description: trimmedDescription.isEmpty ? nil : trimmedDescription,
                 climbType: selectedClimbType,
                 difficulty: difficulty,
-                setter: trimmedSetter.isEmpty ? nil : trimmedSetter,
+
                 tags: trimmedTags,
                 location: trimmedLocation.isEmpty ? nil : trimmedLocation,
                 imagePaths: imagePaths,

ios/OpenClimb/Views/AnalyticsView.swift

@@ -105,9 +105,26 @@ struct ProgressChartSection: View {
     @EnvironmentObject var dataManager: ClimbingDataManager
     @State private var selectedSystem: DifficultySystem = .vScale
     @State private var showAllTime: Bool = true
+    @State private var cachedGradeCountData: [GradeCount] = []
+    @State private var lastCalculationDate: Date = Date.distantPast
+    @State private var lastDataHash: Int = 0
 
     private var gradeCountData: [GradeCount] {
-        calculateGradeCounts()
+        let currentHash =
+            dataManager.problems.count + dataManager.attempts.count + (showAllTime ? 1 : 0)
+        let now = Date()
+
+        // Recalculate only if data changed or cache is older than 30 seconds
+        if currentHash != lastDataHash || now.timeIntervalSince(lastCalculationDate) > 30 {
+            let newData = calculateGradeCounts()
+            DispatchQueue.main.async {
+                self.cachedGradeCountData = newData
+                self.lastCalculationDate = now
+                self.lastDataHash = currentHash
+            }
+        }
+
+        return cachedGradeCountData.isEmpty ? calculateGradeCounts() : cachedGradeCountData
     }
 
     private var usedSystems: [DifficultySystem] {

ios/OpenClimb/Views/Detail/GymDetailView.swift

@@ -1,4 +1,3 @@
-
 import SwiftUI
 
 struct GymDetailView: View {
@@ -60,8 +59,10 @@ struct GymDetailView: View {
             ToolbarItemGroup(placement: .navigationBarTrailing) {
                 if gym != nil {
                     Menu {
-                        Button("Edit Gym") {
+                        Button {
                             // Navigate to edit view
+                        } label: {
+                            Label("Edit Gym", systemImage: "pencil")
                         }
 
                         Button(role: .destructive) {

ios/OpenClimb/Views/Detail/ProblemDetailView.swift

@@ -1,4 +1,3 @@
-
 import SwiftUI
 
 struct ProblemDetailView: View {
@@ -64,8 +63,10 @@ struct ProblemDetailView: View {
             ToolbarItemGroup(placement: .navigationBarTrailing) {
                 if problem != nil {
                     Menu {
-                        Button("Edit Problem") {
+                        Button {
                             showingEditProblem = true
+                        } label: {
+                            Label("Edit Problem", systemImage: "pencil")
                         }
 
                         Button(role: .destructive) {
@@ -167,12 +168,6 @@ struct ProblemHeaderCard: View {
                     .font(.body)
             }
 
-            if let setter = problem.setter, !setter.isEmpty {
-                Text("Set by: \(setter)")
-                    .font(.subheadline)
-                    .foregroundColor(.secondary)
-            }
-
             if !problem.tags.isEmpty {
                 ScrollView(.horizontal, showsIndicators: false) {
                     HStack(spacing: 8) {

ios/OpenClimb/Views/Detail/SessionDetailView.swift

@@ -15,6 +15,18 @@ struct SessionDetailView: View {
         dataManager.session(withId: sessionId)
     }
 
+    private func startTimer() {
+        // Update every 5 seconds instead of 1 second for better performance
+        timer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: true) { _ in
+            currentTime = Date()
+        }
+    }
+
+    private func stopTimer() {
+        timer?.invalidate()
+        timer = nil
+    }
+
     private var gym: Gym? {
         guard let session = session else { return nil }
         return dataManager.gym(withId: session.gymId)
@@ -35,7 +47,7 @@ struct SessionDetailView: View {
         calculateSessionStats()
     }
 
-    private let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
+    @State private var timer: Timer?
 
     var body: some View {
         ScrollView {
@@ -57,8 +69,11 @@ struct SessionDetailView: View {
             }
             .padding()
         }
-        .onReceive(timer) { _ in
+        .onAppear {
-            currentTime = Date()
+            startTimer()
+        }
+        .onDisappear {
+            stopTimer()
         }
         .navigationTitle("Session Details")
         .navigationBarTitleDisplayMode(.inline)
@@ -153,46 +168,14 @@ struct SessionDetailView: View {
         let uniqueProblems = Set(attempts.map { $0.problemId })
         let completedProblems = Set(successfulAttempts.map { $0.problemId })
 
-        let attemptedProblems = uniqueProblems.compactMap { dataManager.problem(withId: $0) }
-        let boulderProblems = attemptedProblems.filter { $0.climbType == .boulder }
-        let ropeProblems = attemptedProblems.filter { $0.climbType == .rope }
-
-        let boulderRange = gradeRange(for: boulderProblems)
-        let ropeRange = gradeRange(for: ropeProblems)
-
         return SessionStats(
             totalAttempts: attempts.count,
             successfulAttempts: successfulAttempts.count,
             uniqueProblemsAttempted: uniqueProblems.count,
-            uniqueProblemsCompleted: completedProblems.count,
+            uniqueProblemsCompleted: completedProblems.count
-            boulderRange: boulderRange,
-            ropeRange: ropeRange
         )
     }
 
-    private func gradeRange(for problems: [Problem]) -> String? {
-        guard !problems.isEmpty else { return nil }
-        let difficulties = problems.map { $0.difficulty }
-
-        // Group by difficulty system first
-        let groupedBySystem = Dictionary(grouping: difficulties) { $0.system }
-
-        // For each system, find the range
-        let ranges = groupedBySystem.compactMap { (system, difficulties) -> String? in
-            let sortedDifficulties = difficulties.sorted()
-            guard let min = sortedDifficulties.first, let max = sortedDifficulties.last else {
-                return nil
-            }
-
-            if min == max {
-                return min.grade
-            } else {
-                return "\(min.grade) - \(max.grade)"
-            }
-        }
-
-        return ranges.joined(separator: ", ")
-    }
 }
 
 struct SessionHeaderCard: View {
@@ -297,22 +280,8 @@ struct SessionStatsCard: View {
                 LazyVGrid(columns: Array(repeating: GridItem(.flexible()), count: 2), spacing: 16) {
                     StatItem(label: "Total Attempts", value: "\(stats.totalAttempts)")
                     StatItem(label: "Problems", value: "\(stats.uniqueProblemsAttempted)")
-                    StatItem(label: "Successful", value: "\(stats.successfulAttempts)")
                     StatItem(label: "Completed", value: "\(stats.uniqueProblemsCompleted)")
                 }
-
-                // Grade ranges
-                VStack(alignment: .leading, spacing: 8) {
-                    if let boulderRange = stats.boulderRange, let ropeRange = stats.ropeRange {
-                        HStack {
-                            StatItem(label: "Boulder Range", value: boulderRange)
-                            StatItem(label: "Rope Range", value: ropeRange)
-                        }
-                    } else if let singleRange = stats.boulderRange ?? stats.ropeRange {
-                        StatItem(label: "Grade Range", value: singleRange)
-                            .frame(maxWidth: .infinity, alignment: .center)
-                    }
-                }
             }
         }
         .padding()
@@ -504,8 +473,6 @@ struct SessionStats {
     let successfulAttempts: Int
     let uniqueProblemsAttempted: Int
     let uniqueProblemsCompleted: Int
-    let boulderRange: String?
-    let ropeRange: String?
 }
 
 #Preview {

ios/OpenClimb/Views/GymsView.swift

@@ -1,4 +1,3 @@
-
 import SwiftUI
 
 struct GymsView: View {
@@ -49,7 +48,10 @@ struct GymsList: View {
                 Button {
                     gymToEdit = gym
                 } label: {
-                    Label("Edit", systemImage: "pencil")
+                    HStack {
+                        Image(systemName: "pencil")
+                        Text("Edit")
+                    }
                 }
                 .tint(.blue)
             }

ios/OpenClimb/Views/ProblemsView.swift

@@ -1,4 +1,3 @@
-
 import SwiftUI
 
 struct ProblemsView: View {
@@ -14,10 +13,9 @@ struct ProblemsView: View {
         // Apply search filter
         if !searchText.isEmpty {
             filtered = filtered.filter { problem in
-                (problem.name?.localizedCaseInsensitiveContains(searchText) ?? false)
+                return problem.name?.localizedCaseInsensitiveContains(searchText) ?? false
                     || (problem.description?.localizedCaseInsensitiveContains(searchText) ?? false)
                     || (problem.location?.localizedCaseInsensitiveContains(searchText) ?? false)
-                    || (problem.setter?.localizedCaseInsensitiveContains(searchText) ?? false)
                     || problem.tags.contains { $0.localizedCaseInsensitiveContains(searchText) }
             }
         }
@@ -32,7 +30,11 @@ struct ProblemsView: View {
             filtered = filtered.filter { $0.gymId == gym.id }
         }
 
-        return filtered.sorted { $0.updatedAt > $1.updatedAt }
+        // Separate active and inactive problems
+        let active = filtered.filter { $0.isActive }.sorted { $0.updatedAt > $1.updatedAt }
+        let inactive = filtered.filter { !$0.isActive }.sorted { $0.updatedAt > $1.updatedAt }
+
+        return active + inactive
     }
 
     var body: some View {
@@ -196,10 +198,23 @@ struct ProblemsList: View {
                     Label("Delete", systemImage: "trash")
                 }
 
+                Button {
+                    let updatedProblem = problem.updated(isActive: !problem.isActive)
+                    dataManager.updateProblem(updatedProblem)
+                } label: {
+                    Label(
+                        problem.isActive ? "Mark as Reset" : "Mark as Active",
+                        systemImage: problem.isActive ? "xmark.circle" : "checkmark.circle")
+                }
+                .tint(.orange)
+
                 Button {
                     problemToEdit = problem
                 } label: {
-                    Label("Edit", systemImage: "pencil")
+                    HStack {
+                        Image(systemName: "pencil")
+                        Text("Edit")
+                    }
                 }
                 .tint(.blue)
             }
@@ -240,6 +255,7 @@ struct ProblemRow: View {
                     Text(problem.name ?? "Unnamed Problem")
                         .font(.headline)
                         .fontWeight(.semibold)
+                        .foregroundColor(problem.isActive ? .primary : .secondary)
 
                     Text(gym?.name ?? "Unknown Gym")
                         .font(.subheadline)
@@ -286,7 +302,7 @@ struct ProblemRow: View {
 
             if !problem.imagePaths.isEmpty {
                 ScrollView(.horizontal, showsIndicators: false) {
-                    HStack(spacing: 8) {
+                    LazyHStack(spacing: 8) {
                         ForEach(problem.imagePaths.prefix(3), id: \.self) { imagePath in
                             ProblemImageView(imagePath: imagePath)
                         }
@@ -296,9 +312,9 @@ struct ProblemRow: View {
             }
 
             if !problem.isActive {
-                Text("Inactive")
+                Text("Reset / No Longer Set")
                     .font(.caption)
-                    .foregroundColor(.red)
+                    .foregroundColor(.orange)
                     .fontWeight(.medium)
             }
         }
@@ -372,6 +388,13 @@ struct ProblemImageView: View {
     @State private var isLoading = true
     @State private var hasFailed = false
 
+    private static var imageCache: NSCache<NSString, UIImage> = {
+        let cache = NSCache<NSString, UIImage>()
+        cache.countLimit = 100
+        cache.totalCostLimit = 50 * 1024 * 1024  // 50MB
+        return cache
+    }()
+
     var body: some View {
         Group {
             if let uiImage = uiImage {
@@ -412,10 +435,22 @@ struct ProblemImageView: View {
             return
         }
 
+        let cacheKey = NSString(string: imagePath)
+
+        // Check cache first
+        if let cachedImage = Self.imageCache.object(forKey: cacheKey) {
+            self.uiImage = cachedImage
+            self.isLoading = false
+            return
+        }
+
         DispatchQueue.global(qos: .userInitiated).async {
             if let data = ImageManager.shared.loadImageData(fromPath: imagePath),
                 let image = UIImage(data: data)
             {
+                // Cache the image
+                Self.imageCache.setObject(image, forKey: cacheKey)
+
                 DispatchQueue.main.async {
                     self.uiImage = image
                     self.isLoading = false

ios/OpenClimb/Views/SessionsView.swift

@@ -114,7 +114,7 @@ struct ActiveSessionBanner: View {
     @State private var currentTime = Date()
     @State private var navigateToDetail = false
 
-    private let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
+    @State private var timer: Timer?
 
     var body: some View {
         HStack {
@@ -162,18 +162,15 @@ struct ActiveSessionBanner: View {
                 .fill(.green.opacity(0.1))
                 .stroke(.green.opacity(0.3), lineWidth: 1)
         )
-        .onReceive(timer) { _ in
+        .onAppear {
-            currentTime = Date()
+            startTimer()
+        }
+        .onDisappear {
+            stopTimer()
+        }
+        .navigationDestination(isPresented: $navigateToDetail) {
+            SessionDetailView(sessionId: session.id)
         }
-        .background(
-            NavigationLink(
-                destination: SessionDetailView(sessionId: session.id),
-                isActive: $navigateToDetail
-            ) {
-                EmptyView()
-            }
-            .hidden()
-        )
     }
 
     private func formatDuration(from start: Date, to end: Date) -> String {
@@ -190,6 +187,17 @@ struct ActiveSessionBanner: View {
             return String(format: "%ds", seconds)
         }
     }
+
+    private func startTimer() {
+        timer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: true) { _ in
+            currentTime = Date()
+        }
+    }
+
+    private func stopTimer() {
+        timer?.invalidate()
+        timer = nil
+    }
 }
 
 struct SessionRow: View {

ios/OpenClimb/Views/SettingsView.swift

@@ -164,60 +164,70 @@ struct ExportDataView: View {
     let data: Data
     @Environment(\.dismiss) private var dismiss
     @State private var tempFileURL: URL?
+    @State private var isCreatingFile = true
 
     var body: some View {
         NavigationView {
-            VStack(spacing: 20) {
+            VStack(spacing: 30) {
-                Image(systemName: "square.and.arrow.up")
+                if isCreatingFile {
-                    .font(.system(size: 60))
+                    // Loading state - more prominent
-                    .foregroundColor(.blue)
+                    VStack(spacing: 20) {
+                        ProgressView()
+                            .scaleEffect(1.5)
+                            .tint(.blue)
 
-                Text("Export Data")
+                        Text("Preparing Your Export")
-                    .font(.title)
+                            .font(.title2)
-                    .fontWeight(.bold)
+                            .fontWeight(.semibold)
 
-                Text(
+                        Text("Creating ZIP file with your climbing data and images...")
-                    "Your climbing data has been prepared for export. Use the share button below to save or send your data."
+                            .font(.body)
-                )
+                            .foregroundColor(.secondary)
-                .multilineTextAlignment(.center)
+                            .multilineTextAlignment(.center)
-                .padding(.horizontal)
+                            .padding(.horizontal)
-
-                if let fileURL = tempFileURL {
-                    ShareLink(
-                        item: fileURL,
-                        preview: SharePreview(
-                            "OpenClimb Data Export",
-                            image: Image("MountainsIcon"))
-                    ) {
-                        Label("Share Data", systemImage: "square.and.arrow.up")
-                            .font(.headline)
-                            .foregroundColor(.white)
-                            .frame(maxWidth: .infinity)
-                            .padding()
-                            .background(
-                                RoundedRectangle(cornerRadius: 12)
-                                    .fill(.blue)
-                            )
                     }
-                    .padding(.horizontal)
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
-                    .buttonStyle(.plain)
                 } else {
-                    Button(action: {}) {
+                    // Ready state
-                        Label("Preparing Export...", systemImage: "hourglass")
+                    VStack(spacing: 20) {
-                            .font(.headline)
+                        Image(systemName: "checkmark.circle.fill")
-                            .foregroundColor(.white)
+                            .font(.system(size: 60))
-                            .frame(maxWidth: .infinity)
+                            .foregroundColor(.green)
-                            .padding()
-                            .background(
-                                RoundedRectangle(cornerRadius: 12)
-                                    .fill(.gray)
-                            )
-                    }
-                    .disabled(true)
-                    .padding(.horizontal)
-                }
 
-                Spacer()
+                        Text("Export Ready!")
+                            .font(.title)
+                            .fontWeight(.bold)
+
+                        Text(
+                            "Your climbing data has been prepared for export. Use the share button below to save or send your data."
+                        )
+                        .multilineTextAlignment(.center)
+                        .padding(.horizontal)
+
+                        if let fileURL = tempFileURL {
+                            ShareLink(
+                                item: fileURL,
+                                preview: SharePreview(
+                                    "OpenClimb Data Export",
+                                    image: Image("MountainsIcon"))
+                            ) {
+                                Label("Share Data", systemImage: "square.and.arrow.up")
+                                    .font(.headline)
+                                    .foregroundColor(.white)
+                                    .frame(maxWidth: .infinity)
+                                    .padding()
+                                    .background(
+                                        RoundedRectangle(cornerRadius: 12)
+                                            .fill(.blue)
+                                    )
+                            }
+                            .padding(.horizontal)
+                            .buttonStyle(.plain)
+                        }
+                    }
+
+                    Spacer()
+                }
             }
             .padding()
             .navigationTitle("Export")
@@ -259,6 +269,9 @@ struct ExportDataView: View {
                     ).first
                 else {
                     print("Could not access Documents directory")
+                    DispatchQueue.main.async {
+                        self.isCreatingFile = false
+                    }
                     return
                 }
                 let fileURL = documentsURL.appendingPathComponent(filename)
@@ -268,9 +281,13 @@ struct ExportDataView: View {
 
                 DispatchQueue.main.async {
                     self.tempFileURL = fileURL
+                    self.isCreatingFile = false
                 }
             } catch {
                 print("Failed to create export file: \(error)")
+                DispatchQueue.main.async {
+                    self.isCreatingFile = false
+                }
             }
         }
     }