iOS 2.4.1 - Minor Visual Tweaks

Reviewed-on: #6

android/app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
         applicationId = "com.atridad.ascently"
         minSdk = 31
         targetSdk = 36
-        versionCode = 45
+        versionCode = 47
-        versionName = "2.2.0"
+        versionName = "2.3.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -38,7 +38,10 @@ android {
 
     java { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } }
 
-    buildFeatures { compose = true }
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
 }
 
 kotlin { compilerOptions { jvmTarget.set(JvmTarget.JVM_17) } }

android/app/src/main/AndroidManifest.xml

@@ -27,6 +27,7 @@
 
     <!-- Permissions for notifications and foreground service -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.POST_PROMOTED_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 

android/app/src/main/java/com/atridad/ascently/data/health/HealthConnectStub.kt

@@ -3,7 +3,7 @@ package com.atridad.ascently.data.health
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
+import com.atridad.ascently.utils.AppLogger
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.health.connect.client.HealthConnectClient
 import androidx.health.connect.client.PermissionController
@@ -60,7 +60,7 @@ class HealthConnectManager(private val context: Context) {
         try {
             HealthConnectClient.getOrCreate(context)
         } catch (e: Exception) {
-            Log.e(TAG, "Failed to create Health Connect client", e)
+            AppLogger.e(TAG, e) { "Failed to create Health Connect client" }
             _isCompatible.value = false
             null
         }
@@ -75,7 +75,7 @@ class HealthConnectManager(private val context: Context) {
             val status = HealthConnectClient.getSdkStatus(context)
             emit(status == HealthConnectClient.SDK_AVAILABLE)
         } catch (e: Exception) {
-            Log.e(TAG, "Error checking Health Connect availability", e)
+            AppLogger.e(TAG, e) { "Error checking Health Connect availability" }
             _isCompatible.value = false
             emit(false)
         }
@@ -90,10 +90,10 @@ class HealthConnectManager(private val context: Context) {
             try {
                 val alreadyHasPermissions = hasAllPermissions()
                 if (!alreadyHasPermissions) {
-                    Log.d(TAG, "Health Connect enabled - permissions will be requested by UI")
+                    AppLogger.d(TAG) { "Health Connect enabled - permissions will be requested by UI" }
                 }
             } catch (e: Exception) {
-                Log.w(TAG, "Error checking permissions when enabling Health Connect", e)
+                AppLogger.w(TAG, e) { "Error checking permissions when enabling Health Connect" }
             }
         } else if (!enabled) {
             setPermissionsGranted(false)
@@ -119,7 +119,7 @@ class HealthConnectManager(private val context: Context) {
             setPermissionsGranted(hasAll)
             hasAll
         } catch (e: Exception) {
-            Log.e(TAG, "Error checking permissions", e)
+            AppLogger.e(TAG, e) { "Error checking permissions" }
             setPermissionsGranted(false)
             false
         }
@@ -135,7 +135,7 @@ class HealthConnectManager(private val context: Context) {
             val hasPerms = if (isAvailable) hasAllPermissions() else false
             isAvailable && hasPerms
         } catch (e: Exception) {
-            Log.e(TAG, "Error checking Health Connect readiness", e)
+            AppLogger.e(TAG, e) { "Error checking Health Connect readiness" }
             false
         }
     }
@@ -148,7 +148,7 @@ class HealthConnectManager(private val context: Context) {
         return try {
             REQUIRED_PERMISSIONS.map { it }.toSet()
         } catch (e: Exception) {
-            Log.e(TAG, "Error getting required permissions", e)
+            AppLogger.e(TAG, e) { "Error getting required permissions" }
             emptySet()
         }
     }
@@ -181,7 +181,7 @@ class HealthConnectManager(private val context: Context) {
                 )
             }
 
-            Log.d(TAG, "Attempting to sync session '${session.id}' to Health Connect...")
+            AppLogger.d(TAG) { "Attempting to sync session '${session.id}' to Health Connect..." }
 
             val records = mutableListOf<androidx.health.connect.client.records.Record>()
 
@@ -199,7 +199,7 @@ class HealthConnectManager(private val context: Context) {
                     )
                 records.add(exerciseSession)
             } catch (e: Exception) {
-                Log.w(TAG, "Failed to create exercise session record", e)
+                AppLogger.w(TAG, e) { "Failed to create exercise session record" }
             }
 
             try {
@@ -220,23 +220,22 @@ class HealthConnectManager(private val context: Context) {
                     records.add(caloriesRecord)
                 }
             } catch (e: Exception) {
-                Log.w(TAG, "Failed to create calories record", e)
+                AppLogger.w(TAG, e) { "Failed to create calories record" }
             }
 
             try {
                 val heartRateRecord = createHeartRateRecord(startTime, endTime, attemptCount)
                 heartRateRecord?.let { records.add(it) }
             } catch (e: Exception) {
-                Log.w(TAG, "Failed to create heart rate record", e)
+                AppLogger.w(TAG, e) { "Failed to create heart rate record" }
             }
 
             if (records.isNotEmpty() && healthConnectClient != null) {
-                Log.d(TAG, "Writing ${records.size} records to Health Connect...")
+                AppLogger.d(TAG) { "Writing ${records.size} records to Health Connect..." }
                 healthConnectClient!!.insertRecords(records)
-                Log.i(
+                AppLogger.i(TAG) {
-                        TAG,
                     "Successfully synced ${records.size} records for session '${session.id}' to Health Connect"
-                )
+                }
 
                 preferences
                     .edit()
@@ -249,13 +248,13 @@ class HealthConnectManager(private val context: Context) {
                         healthConnectClient == null -> "Health Connect client unavailable"
                         else -> "Unknown reason"
                     }
-                Log.w(TAG, "Sync failed for session '${session.id}': $reason")
+                AppLogger.w(TAG) { "Sync failed for session '${session.id}': $reason" }
                 return Result.failure(Exception("Sync failed: $reason"))
             }
 
             Result.success(Unit)
         } catch (e: Exception) {
-            Log.e(TAG, "Error syncing climbing session to Health Connect", e)
+            AppLogger.e(TAG, e) { "Error syncing climbing session to Health Connect" }
             Result.failure(e)
         }
     }
@@ -266,7 +265,7 @@ class HealthConnectManager(private val context: Context) {
         attemptCount: Int = 0
     ): Result<Unit> {
         return if (_autoSync.value && isReady() && session.status == SessionStatus.COMPLETED) {
-            Log.d(TAG, "Auto-syncing completed session '${session.id}' to Health Connect...")
+            AppLogger.d(TAG) { "Auto-syncing completed session '${session.id}' to Health Connect..." }
             syncCompletedSession(session, gymName, attemptCount)
         } else {
             val reason =
@@ -276,7 +275,7 @@ class HealthConnectManager(private val context: Context) {
                     !isReady() -> "Health Connect not ready"
                     else -> "unknown reason"
                 }
-            Log.d(TAG, "Auto-sync skipped for session '${session.id}': $reason")
+            AppLogger.d(TAG) { "Auto-sync skipped for session '${session.id}': $reason" }
             Result.success(Unit)
         }
     }
@@ -328,7 +327,7 @@ class HealthConnectManager(private val context: Context) {
                 samples = samples
             )
         } catch (e: Exception) {
-            Log.e(TAG, "Error creating heart rate record", e)
+            AppLogger.e(TAG, e) { "Error creating heart rate record" }
             null
         }
     }

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

@@ -13,6 +13,7 @@ import com.atridad.ascently.data.format.DeletedItem
 import com.atridad.ascently.data.model.*
 import com.atridad.ascently.data.state.DataStateManager
 import com.atridad.ascently.utils.DateFormatUtils
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.utils.ZipExportImportUtils
 import java.io.File
 import kotlinx.coroutines.flow.Flow
@@ -43,11 +44,13 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
         dataStateManager.updateDataState()
         triggerAutoSync()
     }
+
     suspend fun updateGym(gym: Gym) {
         gymDao.updateGym(gym)
         dataStateManager.updateDataState()
         triggerAutoSync()
     }
+
     suspend fun deleteGym(gym: Gym) {
         gymDao.deleteGym(gym)
         trackDeletion(gym.id, "gym")
@@ -63,10 +66,12 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
         problemDao.insertProblem(problem)
         dataStateManager.updateDataState()
     }
+
     suspend fun updateProblem(problem: Problem) {
         problemDao.updateProblem(problem)
         dataStateManager.updateDataState()
     }
+
     suspend fun deleteProblem(problem: Problem) {
         problemDao.deleteProblem(problem)
         trackDeletion(problem.id, "problem")
@@ -78,6 +83,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
     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) {
@@ -88,6 +94,7 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
             triggerAutoSync()
         }
     }
+
     suspend fun updateSession(session: ClimbSession) {
         sessionDao.updateSession(session)
         dataStateManager.updateDataState()
@@ -96,12 +103,14 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
             triggerAutoSync()
         }
     }
+
     suspend fun deleteSession(session: ClimbSession) {
         sessionDao.deleteSession(session)
         trackDeletion(session.id, "session")
         dataStateManager.updateDataState()
         triggerAutoSync()
     }
+
     suspend fun getLastUsedGym(): Gym? {
         val recentSessions = sessionDao.getRecentSessions(1).first()
         return if (recentSessions.isNotEmpty()) {
@@ -115,16 +124,20 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
     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)
         dataStateManager.updateDataState()
     }
+
     suspend fun updateAttempt(attempt: Attempt) {
         attemptDao.updateAttempt(attempt)
         dataStateManager.updateDataState()
     }
+
     suspend fun deleteAttempt(attempt: Attempt) {
         attemptDao.deleteAttempt(attempt)
         trackDeletion(attempt.id, "attempt")
@@ -386,10 +399,10 @@ class ClimbRepository(database: AscentlyDatabase, private val context: Context)
             if (imagesDir.exists() && imagesDir.isDirectory) {
                 val deletedCount = imagesDir.listFiles()?.size ?: 0
                 imagesDir.deleteRecursively()
-                android.util.Log.i("ClimbRepository", "Cleared $deletedCount image files")
+                AppLogger.i("ClimbRepository") { "Cleared $deletedCount image files" }
             }
         } catch (e: Exception) {
-            android.util.Log.w("ClimbRepository", "Failed to clear some images: ${e.message}")
+            AppLogger.w("ClimbRepository", e) { "Failed to clear some images: ${e.message}" }
         }
     }
 }

android/app/src/main/java/com/atridad/ascently/data/state/DataStateManager.kt

@@ -2,8 +2,8 @@ package com.atridad.ascently.data.state
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
 import androidx.core.content.edit
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.utils.DateFormatUtils
 
 /**
@@ -26,7 +26,7 @@ class DataStateManager(context: Context) {
         if (!isInitialized()) {
             updateDataState()
             markAsInitialized()
-            Log.d(TAG, "DataStateManager initialized with timestamp: ${getLastModified()}")
+            AppLogger.d(TAG) { "DataStateManager initialized with timestamp: ${getLastModified()}" }
         }
     }
 
@@ -37,7 +37,7 @@ class DataStateManager(context: Context) {
     fun updateDataState() {
         val now = DateFormatUtils.nowISO8601()
         prefs.edit { putString(KEY_LAST_MODIFIED, now) }
-        Log.d(TAG, "Data state updated to: $now")
+        AppLogger.d(TAG) { "Data state updated to: $now" }
     }
 
     /**

android/app/src/main/java/com/atridad/ascently/data/sync/SyncService.kt

@@ -4,10 +4,10 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
-import android.util.Log
 import androidx.annotation.RequiresPermission
 import androidx.core.content.edit
 import com.atridad.ascently.data.format.BackupAttempt
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.data.format.BackupClimbSession
 import com.atridad.ascently.data.format.BackupGym
 import com.atridad.ascently.data.format.BackupProblem
@@ -164,12 +164,12 @@ class SyncService(private val context: Context, private val repository: ClimbRep
     @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
     suspend fun syncWithServer() {
         if (isOfflineMode) {
-            Log.d(TAG, "Sync skipped: Offline mode is enabled.")
+            AppLogger.d(TAG) { "Sync skipped: Offline mode is enabled." }
             return
         }
         if (!isNetworkAvailable()) {
             _syncError.value = "No internet connection."
-            Log.d(TAG, "Sync skipped: No internet connection.")
+            AppLogger.d(TAG) { "Sync skipped: No internet connection." }
             return
         }
         if (!_isConfigured.value) {
@@ -202,29 +202,32 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                 // If both client and server have been synced before, use delta sync
                 val lastSyncTimeStr = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
                 if (hasLocalData && hasServerData && lastSyncTimeStr != null) {
-                    Log.d(TAG, "Using delta sync for incremental updates")
+                    AppLogger.d(TAG) { "Using delta sync for incremental updates" }
                     performDeltaSync(lastSyncTimeStr)
                 } else {
                     when {
                         !hasLocalData && hasServerData -> {
-                            Log.d(TAG, "No local data found, performing full restore from server")
+                            AppLogger.d(TAG) { "No local data found, performing full restore from server" }
                             val imagePathMapping = syncImagesFromServer(serverBackup)
                             importBackupToRepository(serverBackup, imagePathMapping)
-                            Log.d(TAG, "Full restore completed")
+                            AppLogger.d(TAG) { "Full restore completed" }
                         }
+
                         hasLocalData && !hasServerData -> {
-                            Log.d(TAG, "No server data found, uploading local data to server")
+                            AppLogger.d(TAG) { "No server data found, uploading local data to server" }
                             uploadData(localBackup)
                             syncImagesForBackup(localBackup)
-                            Log.d(TAG, "Initial upload completed")
+                            AppLogger.d(TAG) { "Initial upload completed" }
                         }
+
                         hasLocalData && hasServerData -> {
-                            Log.d(TAG, "Both local and server data exist, merging (server wins)")
+                            AppLogger.d(TAG) { "Both local and server data exist, merging (server wins)" }
                             mergeDataSafely(serverBackup)
-                            Log.d(TAG, "Merge completed")
+                            AppLogger.d(TAG) { "Merge completed" }
                         }
+
                         else -> {
-                            Log.d(TAG, "No data to sync")
+                            AppLogger.d(TAG) { "No data to sync" }
                         }
                     }
                 }
@@ -242,7 +245,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
     }
 
     private suspend fun performDeltaSync(lastSyncTimeStr: String) {
-        Log.d(TAG, "Starting delta sync with lastSyncTime=$lastSyncTimeStr")
+        AppLogger.d(TAG) { "Starting delta sync with lastSyncTime=$lastSyncTimeStr" }
 
         // Parse last sync time to filter modified items
         val lastSyncDate = parseISO8601(lastSyncTimeStr) ?: Date(0)
@@ -295,10 +298,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                 parseISO8601(item.deletedAt)?.after(lastSyncDate) == true
             }
 
-        Log.d(
+        AppLogger.d(TAG) {
-                TAG,
             "Delta sync sending: gyms=${modifiedGyms.size}, problems=${modifiedProblems.size}, sessions=${modifiedSessions.size}, attempts=${modifiedAttempts.size}, deletions=${modifiedDeletions.size}"
-        )
+        }
 
         // Create delta request
         val deltaRequest =
@@ -342,10 +344,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                 }
             }
 
-        Log.d(
+        AppLogger.d(TAG) {
-                TAG,
             "Delta sync received: gyms=${deltaResponse.gyms.size}, problems=${deltaResponse.problems.size}, sessions=${deltaResponse.sessions.size}, attempts=${deltaResponse.attempts.size}, deletions=${deltaResponse.deletedItems.size}"
-        )
+        }
 
         // Apply server changes to local data
         applyDeltaResponse(deltaResponse)
@@ -372,7 +373,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
             val allDeletions = repository.getDeletedItems() + response.deletedItems
             val uniqueDeletions = allDeletions.distinctBy { "${it.type}:${it.id}" }
 
-            Log.d(TAG, "Applying ${uniqueDeletions.size} deletion records before merging data")
+            AppLogger.d(TAG) { "Applying ${uniqueDeletions.size} deletion records before merging data" }
             applyDeletions(uniqueDeletions)
 
             // Build deleted item lookup set
@@ -392,7 +393,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                             imagePathMapping[imagePath] = localImagePath
                         }
                     } catch (e: Exception) {
-                        Log.w(TAG, "Failed to download image $imagePath: ${e.message}")
+                        AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
                     }
                 }
             }
@@ -496,12 +497,15 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                 "gym" -> {
                     existingGyms.find { it.id == item.id }?.let { repository.deleteGym(it) }
                 }
+
                 "problem" -> {
                     existingProblems.find { it.id == item.id }?.let { repository.deleteProblem(it) }
                 }
+
                 "session" -> {
                     existingSessions.find { it.id == item.id }?.let { repository.deleteSession(it) }
                 }
+
                 "attempt" -> {
                     existingAttempts.find { it.id == item.id }?.let { repository.deleteAttempt(it) }
                 }
@@ -512,7 +516,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
     private suspend fun syncModifiedImages(modifiedProblems: List<BackupProblem>) {
         if (modifiedProblems.isEmpty()) return
 
-        Log.d(TAG, "Syncing images for ${modifiedProblems.size} modified problems")
+        AppLogger.d(TAG) { "Syncing images for ${modifiedProblems.size} modified problems" }
 
         for (backupProblem in modifiedProblems) {
             backupProblem.imagePaths?.forEach { imagePath ->
@@ -583,7 +587,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
     private suspend fun syncImagesFromServer(backup: ClimbDataBackup): Map<String, String> {
         val imagePathMapping = mutableMapOf<String, String>()
         val totalImages = backup.problems.sumOf { it.imagePaths?.size ?: 0 }
-        Log.d(TAG, "Starting image download from server for $totalImages images")
+        AppLogger.d(TAG) { "Starting image download from server for $totalImages images" }
 
         withContext(Dispatchers.IO) {
             backup.problems.forEach { problem ->
@@ -595,9 +599,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                             imagePathMapping[imagePath] = localImagePath
                         }
                     } catch (_: SyncException.ImageNotFound) {
-                        Log.w(TAG, "Image not found on server: $imagePath")
+                        AppLogger.w(TAG) { "Image not found on server: $imagePath" }
                     } catch (e: Exception) {
-                        Log.w(TAG, "Failed to download image $imagePath: ${e.message}")
+                        AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
                     }
                 }
             }
@@ -625,14 +629,14 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                     }
                 }
             } catch (e: IOException) {
-                Log.e(TAG, "Network error downloading image $serverFilename", e)
+                AppLogger.e(TAG, e) { "Network error downloading image $serverFilename" }
                 null
             }
         }
     }
 
     private suspend fun syncImagesForBackup(backup: ClimbDataBackup) {
-        Log.d(TAG, "Starting image sync for backup with ${backup.problems.size} problems")
+        AppLogger.d(TAG) { "Starting image sync for backup with ${backup.problems.size} problems" }
         withContext(Dispatchers.IO) {
             backup.problems.forEach { problem ->
                 problem.imagePaths?.forEach { localPath ->
@@ -646,7 +650,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
     private suspend fun uploadImage(localPath: String, filename: String) {
         val file = ImageUtils.getImageFile(context, localPath)
         if (!file.exists()) {
-            Log.w(TAG, "Local image file not found, cannot upload: $localPath")
+            AppLogger.w(TAG) { "Local image file not found, cannot upload: $localPath" }
             return
         }
 
@@ -663,16 +667,15 @@ class SyncService(private val context: Context, private val repository: ClimbRep
             try {
                 httpClient.newCall(request).execute().use { response ->
                     if (response.isSuccessful) {
-                        Log.d(TAG, "Successfully uploaded image: $filename")
+                        AppLogger.d(TAG) { "Successfully uploaded image: $filename" }
                     } else {
-                        Log.w(
+                        AppLogger.w(TAG) {
-                                TAG,
                             "Failed to upload image $filename. Server responded with ${response.code}"
-                        )
+                        }
                     }
                 }
             } catch (e: IOException) {
-                Log.e(TAG, "Network error uploading image $filename", e)
+                AppLogger.e(TAG, e) { "Network error uploading image $filename" }
             }
         }
     }
@@ -737,7 +740,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
     }
 
     private suspend fun mergeDataSafely(serverBackup: ClimbDataBackup) {
-        Log.d(TAG, "Server data will overwrite local data. Performing full restore.")
+        AppLogger.d(TAG) { "Server data will overwrite local data. Performing full restore." }
         val imagePathMapping = syncImagesFromServer(serverBackup)
         importBackupToRepository(serverBackup, imagePathMapping)
     }
@@ -798,7 +801,7 @@ class SyncService(private val context: Context, private val repository: ClimbRep
                 try {
                     syncWithServer()
                 } catch (e: Exception) {
-                        Log.e(TAG, "Auto-sync failed", e)
+                    AppLogger.e(TAG, e) { "Auto-sync failed" }
                 }
                 if (pendingChanges) {
                     pendingChanges = false
@@ -833,5 +836,6 @@ sealed class SyncException(message: String) : IOException(message), Serializable
     data class ServerError(val code: Int) : SyncException("Server error: HTTP $code")
     data class InvalidResponse(val details: String) :
         SyncException("Invalid server response: $details")
+
     data class NetworkError(val details: String) : SyncException("Network error: $details")
 }

android/app/src/main/java/com/atridad/ascently/service/SessionTrackingService.kt

@@ -6,16 +6,21 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.os.Build
+import android.os.Bundle
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
 import com.atridad.ascently.MainActivity
 import com.atridad.ascently.R
 import com.atridad.ascently.data.database.AscentlyDatabase
 import com.atridad.ascently.data.repository.ClimbRepository
+import com.atridad.ascently.utils.AppLogger
+import com.atridad.ascently.widget.ClimbStatsWidgetProvider
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.temporal.ChronoUnit
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.firstOrNull
-import java.time.LocalDateTime
-import java.time.temporal.ChronoUnit
 import kotlinx.coroutines.runBlocking
 
 class SessionTrackingService : Service() {
@@ -28,6 +33,7 @@ class SessionTrackingService : Service() {
     private lateinit var notificationManager: NotificationManager
 
     companion object {
+        private const val LOG_TAG = "SessionTrackingService"
         const val NOTIFICATION_ID = 1001
         const val CHANNEL_ID = "session_tracking_channel"
         const val ACTION_START_SESSION = "start_session"
@@ -67,16 +73,24 @@ class SessionTrackingService : Service() {
                     startSessionTracking(sessionId)
                 }
             }
+
             ACTION_STOP_SESSION -> {
                 val sessionId = intent.getStringExtra(EXTRA_SESSION_ID)
                 serviceScope.launch {
                     try {
-                        val targetSession = when {
+                        val targetSession =
+                            when {
                                 sessionId != null -> repository.getSessionById(sessionId)
                                 else -> repository.getActiveSession()
                             }
-                        if (targetSession != null && targetSession.status == com.atridad.ascently.data.model.SessionStatus.ACTIVE) {
+                        if (targetSession != null &&
-                            val completed = with(com.atridad.ascently.data.model.ClimbSession) { targetSession.complete() }
+                            targetSession.status ==
+                            com.atridad.ascently.data.model.SessionStatus.ACTIVE
+                        ) {
+                            val completed =
+                                with(com.atridad.ascently.data.model.ClimbSession) {
+                                    targetSession.complete()
+                                }
                             repository.updateSession(completed)
                         }
                     } finally {
@@ -97,11 +111,14 @@ class SessionTrackingService : Service() {
 
         try {
             createAndShowNotification(sessionId)
+            // Update widget when session tracking starts
+            ClimbStatsWidgetProvider.updateAllWidgets(this)
         } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e(LOG_TAG, e) { "Failed to initialize session tracking notification" }
         }
 
-        notificationJob = serviceScope.launch {
+        notificationJob =
+            serviceScope.launch {
                 try {
                     if (!isNotificationActive()) {
                         delay(1000L)
@@ -113,11 +130,12 @@ class SessionTrackingService : Service() {
                         updateNotification(sessionId)
                     }
                 } catch (e: Exception) {
-                e.printStackTrace()
+                    AppLogger.e(LOG_TAG, e) { "Notification updater loop crashed" }
                 }
             }
 
-        monitoringJob = serviceScope.launch {
+        monitoringJob =
+            serviceScope.launch {
                 try {
                     while (isActive) {
                         delay(10000L)
@@ -127,13 +145,17 @@ class SessionTrackingService : Service() {
                         }
 
                         val session = repository.getSessionById(sessionId)
-                    if (session == null || session.status != com.atridad.ascently.data.model.SessionStatus.ACTIVE) {
+                        if (session == null ||
+                            session.status !=
+                            com.atridad.ascently.data.model.SessionStatus
+                                .ACTIVE
+                        ) {
                             stopSessionTracking()
                             break
                         }
                     }
                 } catch (e: Exception) {
-                e.printStackTrace()
+                    AppLogger.e(LOG_TAG, e) { "Session monitoring loop crashed" }
                 }
             }
     }
@@ -143,6 +165,8 @@ class SessionTrackingService : Service() {
         monitoringJob?.cancel()
         stopForeground(STOP_FOREGROUND_REMOVE)
         stopSelf()
+        // Update widget when session tracking stops
+        ClimbStatsWidgetProvider.updateAllWidgets(this)
     }
 
     private fun isNotificationActive(): Boolean {
@@ -157,14 +181,16 @@ class SessionTrackingService : Service() {
     private suspend fun updateNotification(sessionId: String) {
         try {
             createAndShowNotification(sessionId)
+            // Update widget when notification updates
+            ClimbStatsWidgetProvider.updateAllWidgets(this)
         } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e(LOG_TAG, e) { "Failed to update notification; retrying in 10s" }
 
             try {
                 delay(10000L)
                 createAndShowNotification(sessionId)
             } catch (retryException: Exception) {
-                retryException.printStackTrace()
+                AppLogger.e(LOG_TAG, retryException) { "Retrying notification update failed" }
                 stopSessionTracking()
             }
         }
@@ -172,44 +198,22 @@ class SessionTrackingService : Service() {
 
     private fun createAndShowNotification(sessionId: String) {
         try {
-            val session = runBlocking {
+            val session = runBlocking { repository.getSessionById(sessionId) }
-                repository.getSessionById(sessionId)
+            if (session == null ||
-            }
+                session.status != com.atridad.ascently.data.model.SessionStatus.ACTIVE
-            if (session == null || session.status != com.atridad.ascently.data.model.SessionStatus.ACTIVE) {
+            ) {
                 stopSessionTracking()
                 return
             }
 
-            val gym = runBlocking {
+            val gym = runBlocking { repository.getGymById(session.gymId) }
-                repository.getGymById(session.gymId)
-            }
 
             val attempts = runBlocking {
                 repository.getAttemptsBySession(sessionId).firstOrNull() ?: emptyList()
             }
 
-            val duration = session.startTime?.let { startTime ->
+            val notificationBuilder =
-                try {
+                NotificationCompat.Builder(this, CHANNEL_ID)
-                    val start = LocalDateTime.parse(startTime)
-                    val now = LocalDateTime.now()
-                    val totalSeconds = ChronoUnit.SECONDS.between(start, now)
-                    val hours = totalSeconds / 3600
-                    val minutes = (totalSeconds % 3600) / 60
-                    val seconds = totalSeconds % 60
-                    
-                    when {
-                        hours > 0 -> "${hours}h ${minutes}m ${seconds}s"
-                        minutes > 0 -> "${minutes}m ${seconds}s"
-                        else -> "${totalSeconds}s"
-                    }
-                } catch (_: Exception) {
-                    "Active"
-                }
-            } ?: "Active"
-            
-            val notification = NotificationCompat.Builder(this, CHANNEL_ID)
-                .setContentTitle("Climbing Session Active")
-                .setContentText("${gym?.name ?: "Gym"} • $duration • ${attempts.size} attempts")
                     .setSmallIcon(R.drawable.ic_mountains)
                     .setOngoing(true)
                     .setAutoCancel(false)
@@ -227,20 +231,77 @@ class SessionTrackingService : Service() {
                         "End Session",
                         createStopPendingIntent(sessionId)
                     )
-                .build()
+
+            // Use Live Update
+            if (Build.VERSION.SDK_INT >= 36) {
+                val startTimeMillis =
+                    session.startTime?.let { startTime ->
+                        try {
+                            val start = LocalDateTime.parse(startTime)
+                            val zoneId = ZoneId.systemDefault()
+                            start.atZone(zoneId).toInstant().toEpochMilli()
+                        } catch (_: Exception) {
+                            System.currentTimeMillis()
+                        }
+                    }
+                        ?: System.currentTimeMillis()
+
+                notificationBuilder
+                    .setContentTitle("Climbing Session Active")
+                    .setContentText(
+                        "${gym?.name ?: "Gym"} • ${attempts.size} attempts"
+                    )
+                    .setWhen(startTimeMillis)
+                    .setUsesChronometer(true)
+                    .setShowWhen(true)
+
+                val extras = Bundle()
+                extras.putBoolean("android.extra.REQUEST_PROMOTED_ONGOING", true)
+                notificationBuilder.setExtras(extras)
+            } else {
+                // Fallback for older versions
+                val duration =
+                    session.startTime?.let { startTime ->
+                        try {
+                            val start = LocalDateTime.parse(startTime)
+                            val now = LocalDateTime.now()
+                            val totalSeconds = ChronoUnit.SECONDS.between(start, now)
+                            val hours = totalSeconds / 3600
+                            val minutes = (totalSeconds % 3600) / 60
+                            val seconds = totalSeconds % 60
+
+                            when {
+                                hours > 0 -> "${hours}h ${minutes}m ${seconds}s"
+                                minutes > 0 -> "${minutes}m ${seconds}s"
+                                else -> "${totalSeconds}s"
+                            }
+                        } catch (_: Exception) {
+                            "Active"
+                        }
+                    }
+                        ?: "Active"
+
+                notificationBuilder
+                    .setContentTitle("Climbing Session Active")
+                    .setContentText(
+                        "${gym?.name ?: "Gym"} • $duration • ${attempts.size} attempts"
+                    )
+            }
+
+            val notification = notificationBuilder.build()
 
             startForeground(NOTIFICATION_ID, notification)
 
             notificationManager.notify(NOTIFICATION_ID, notification)
-            
         } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e(LOG_TAG, e) { "Failed to build session tracking notification" }
             throw e
         }
     }
 
     private fun createOpenAppIntent(): PendingIntent {
-        val intent = Intent(this, MainActivity::class.java).apply {
+        val intent =
+            Intent(this, MainActivity::class.java).apply {
                 flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
                 action = "OPEN_SESSION"
             }
@@ -263,11 +324,13 @@ class SessionTrackingService : Service() {
     }
 
     private fun createNotificationChannel() {
-        val channel = NotificationChannel(
+        val channel =
+            NotificationChannel(
                 CHANNEL_ID,
                 "Session Tracking",
                 NotificationManager.IMPORTANCE_DEFAULT
-        ).apply {
+            )
+                .apply {
                     description = "Shows active climbing session information"
                     setShowBadge(false)
                     lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC

android/app/src/main/java/com/atridad/ascently/ui/AscentlyApp.kt

@@ -26,6 +26,7 @@ import com.atridad.ascently.ui.components.NotificationPermissionDialog
 import com.atridad.ascently.ui.screens.*
 import com.atridad.ascently.ui.viewmodel.ClimbViewModel
 import com.atridad.ascently.ui.viewmodel.ClimbViewModelFactory
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.utils.AppShortcutManager
 import com.atridad.ascently.utils.NotificationPermissionUtils
 
@@ -101,6 +102,7 @@ fun AscentlyApp(
                     launchSingleTop = true
                 }
             }
+
             AppShortcutManager.ACTION_END_SESSION -> {
                 navController.navigate(Screen.Sessions) {
                     popUpTo(0) { inclusive = true }
@@ -114,10 +116,7 @@ fun AscentlyApp(
 
     LaunchedEffect(shortcutAction, activeSession, gyms, lastUsedGym) {
         if (shortcutAction == AppShortcutManager.ACTION_START_SESSION && gyms.isNotEmpty()) {
-            android.util.Log.d(
+            AppLogger.d("AscentlyApp") { "Processing shortcut action: activeSession=$activeSession, gyms.size=${gyms.size}, lastUsedGymId=$lastUsedGymId, lastUsedGym=${lastUsedGym?.name}" }
-                    "AscentlyApp",
-                    "Processing shortcut action: activeSession=$activeSession, gyms.size=${gyms.size}, lastUsedGymId=$lastUsedGymId, lastUsedGym=${lastUsedGym?.name}"
-            )
 
             if (activeSession == null) {
                 if (NotificationPermissionUtils.shouldRequestNotificationPermission() &&
@@ -125,14 +124,11 @@ fun AscentlyApp(
                         context
                     )
                 ) {
-                    android.util.Log.d("AscentlyApp", "Showing notification permission dialog")
+                    AppLogger.d("AscentlyApp") { "Showing notification permission dialog" }
                     showNotificationPermissionDialog = true
                 } else {
                     if (gyms.size == 1) {
-                        android.util.Log.d(
+                        AppLogger.d("AscentlyApp") { "Starting session with single gym: ${gyms.first().name}" }
-                                "AscentlyApp",
-                                "Starting session with single gym: ${gyms.first().name}"
-                        )
                         viewModel.startSession(context, gyms.first().id)
                     } else {
                         val targetGym =
@@ -140,25 +136,16 @@ fun AscentlyApp(
                                 ?: lastUsedGym
 
                         if (targetGym != null) {
-                            android.util.Log.d(
+                            AppLogger.d("AscentlyApp") { "Starting session with target gym: ${targetGym.name}" }
-                                    "AscentlyApp",
-                                    "Starting session with target gym: ${targetGym.name}"
-                            )
                             viewModel.startSession(context, targetGym.id)
                         } else {
-                            android.util.Log.d(
+                            AppLogger.d("AscentlyApp") { "No target gym found, navigating to selection" }
-                                    "AscentlyApp",
-                                    "No target gym found, navigating to selection"
-                            )
                             navController.navigate(Screen.AddEditSession())
                         }
                     }
                 }
             } else {
-                android.util.Log.d(
+                AppLogger.d("AscentlyApp") { "Active session already exists: ${activeSession?.id}" }
-                        "AscentlyApp",
-                        "Active session already exists: ${activeSession?.id}"
-                )
             }
 
             onShortcutActionProcessed()

android/app/src/main/java/com/atridad/ascently/ui/screens/SessionsScreen.kt

@@ -5,8 +5,6 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -38,6 +36,7 @@ import java.time.YearMonth
 import java.time.format.DateTimeFormatter
 import java.time.format.TextStyle
 import java.util.Locale
+import androidx.core.content.edit
 
 enum class ViewMode {
     LIST,
@@ -60,7 +59,7 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
         mutableStateOf(if (savedViewMode == "CALENDAR") ViewMode.CALENDAR else ViewMode.LIST)
     }
     var selectedMonth by remember { mutableStateOf(YearMonth.now()) }
-    var selectedDate by remember { mutableStateOf<LocalDate?>(null) }
+    var selectedDate by remember { mutableStateOf<LocalDate?>(LocalDate.now()) }
 
     val completedSessions = sessions.filter { it.status == SessionStatus.COMPLETED }
     val activeSessionGym = activeSession?.let { session -> gyms.find { it.id == session.gymId } }
@@ -89,7 +88,7 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
                         viewMode =
                                 if (viewMode == ViewMode.LIST) ViewMode.CALENDAR else ViewMode.LIST
                         selectedDate = null
-                        sharedPreferences.edit().putString("view_mode", viewMode.name).apply()
+                        sharedPreferences.edit { putString("view_mode", viewMode.name) }
                     }
             ) {
                 Icon(
@@ -147,16 +146,11 @@ fun SessionsScreen(viewModel: ClimbViewModel, onNavigateToSessionDetail: (String
                     CalendarView(
                             sessions = completedSessions,
                             gyms = gyms,
-                            activeSession = activeSession,
-                            activeSessionGym = activeSessionGym,
                         selectedMonth = selectedMonth,
                             onMonthChange = { selectedMonth = it },
                             selectedDate = selectedDate,
                             onDateSelected = { selectedDate = it },
-                            onNavigateToSessionDetail = onNavigateToSessionDetail,
+                            onNavigateToSessionDetail = onNavigateToSessionDetail
-                            onEndSession = {
-                                activeSession?.let { viewModel.endSession(context, it.id) }
-                            }
                     )
                 }
             }
@@ -315,14 +309,11 @@ fun EmptyStateMessage(
 fun CalendarView(
         sessions: List<ClimbSession>,
         gyms: List<com.atridad.ascently.data.model.Gym>,
-        activeSession: ClimbSession?,
-        activeSessionGym: com.atridad.ascently.data.model.Gym?,
         selectedMonth: YearMonth,
         onMonthChange: (YearMonth) -> Unit,
         selectedDate: LocalDate?,
         onDateSelected: (LocalDate?) -> Unit,
-        onNavigateToSessionDetail: (String) -> Unit,
+        onNavigateToSessionDetail: (String) -> Unit
-        onEndSession: () -> Unit
 ) {
     val sessionsByDate =
             remember(sessions) {
@@ -331,13 +322,23 @@ fun CalendarView(
                         java.time.Instant.parse(it.date)
                                 .atZone(java.time.ZoneId.systemDefault())
                                 .toLocalDate()
-                    } catch (e: Exception) {
+                    } catch (_: Exception) {
                         LocalDate.parse(it.date, DateTimeFormatter.ISO_LOCAL_DATE)
                     }
                 }
             }
 
-    Column(modifier = Modifier.fillMaxSize()) {
+    val firstDayOfMonth = selectedMonth.atDay(1)
+    val daysInMonth = selectedMonth.lengthOfMonth()
+    val firstDayOfWeek = firstDayOfMonth.dayOfWeek.value % 7
+    val totalCells =
+            ((firstDayOfWeek + daysInMonth) / 7.0).let {
+                if (it == it.toInt().toDouble()) it.toInt() * 7 else (it.toInt() + 1) * 7
+            }
+    val numRows = totalCells / 7
+
+    LazyColumn(modifier = Modifier.fillMaxSize()) {
+        item {
             Card(
                     modifier = Modifier.fillMaxWidth(),
                     colors =
@@ -346,7 +347,8 @@ fun CalendarView(
                             )
             ) {
                 Column(
-                    modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
+                        modifier =
+                                Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
                         horizontalAlignment = Alignment.CenterHorizontally
                 ) {
                     Row(
@@ -410,19 +412,15 @@ fun CalendarView(
             }
 
             Spacer(modifier = Modifier.height(8.dp))
-
-        val firstDayOfMonth = selectedMonth.atDay(1)
-        val daysInMonth = selectedMonth.lengthOfMonth()
-        val firstDayOfWeek = firstDayOfMonth.dayOfWeek.value % 7
-        val totalCells =
-                ((firstDayOfWeek + daysInMonth) / 7.0).let {
-                    if (it == it.toInt().toDouble()) it.toInt() * 7 else (it.toInt() + 1) * 7
         }
 
-        LazyVerticalGrid(columns = GridCells.Fixed(7), modifier = Modifier.fillMaxWidth()) {
+        items(numRows) { rowIndex ->
-            items(totalCells) { index ->
+            Row(modifier = Modifier.fillMaxWidth()) {
+                for (colIndex in 0 until 7) {
+                    val index = rowIndex * 7 + colIndex
                     val dayNumber = index - firstDayOfWeek + 1
 
+                    Box(modifier = Modifier.weight(1f)) {
                         if (dayNumber in 1..daysInMonth) {
                             val date = selectedMonth.atDay(dayNumber)
                             val sessionsOnDate = sessionsByDate[date] ?: emptyList()
@@ -445,10 +443,13 @@ fun CalendarView(
                         }
                     }
                 }
+            }
+        }
 
         if (selectedDate != null) {
             val sessionsOnSelectedDate = sessionsByDate[selectedDate] ?: emptyList()
 
+            item {
                 Spacer(modifier = Modifier.height(16.dp))
 
                 Text(
@@ -458,8 +459,8 @@ fun CalendarView(
                         fontWeight = FontWeight.Bold,
                         modifier = Modifier.padding(vertical = 8.dp)
                 )
+            }
 
-            LazyColumn(modifier = Modifier.fillMaxWidth()) {
             items(sessionsOnSelectedDate) { session ->
                 SessionCard(
                         session = session,
@@ -468,7 +469,8 @@ fun CalendarView(
                 )
                 Spacer(modifier = Modifier.height(8.dp))
             }
-            }
+
+            item { Spacer(modifier = Modifier.height(16.dp)) }
         }
     }
 }

android/app/src/main/java/com/atridad/ascently/ui/screens/SettingsScreen.kt

@@ -583,41 +583,6 @@ fun SettingsScreen(viewModel: ClimbViewModel) {
 
                     Spacer(modifier = Modifier.height(12.dp))
 
-                    Card(
-                            shape = RoundedCornerShape(12.dp),
-                            colors =
-                                    CardDefaults.cardColors(
-                                            containerColor =
-                                                    MaterialTheme.colorScheme.surfaceVariant.copy(
-                                                            alpha = 0.3f
-                                                    )
-                                    )
-                    ) {
-                        ListItem(
-                                headlineContent = {
-                                    Row(
-                                            verticalAlignment = Alignment.CenterVertically,
-                                            horizontalArrangement = Arrangement.spacedBy(8.dp)
-                                    ) {
-                                        Icon(
-                                                painter =
-                                                        painterResource(
-                                                                id = R.drawable.ic_mountains
-                                                        ),
-                                                contentDescription = "Ascently Logo",
-                                                modifier = Modifier.size(24.dp),
-                                                tint = MaterialTheme.colorScheme.primary
-                                        )
-                                        Text("Ascently")
-                                    }
-                                },
-                                supportingContent = { Text("Track your climbing progress") },
-                                leadingContent = {}
-                        )
-                    }
-
-                    Spacer(modifier = Modifier.height(8.dp))
-
                     Card(
                             shape = RoundedCornerShape(12.dp),
                             colors =

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

@@ -8,6 +8,7 @@ import com.atridad.ascently.data.model.*
 import com.atridad.ascently.data.repository.ClimbRepository
 import com.atridad.ascently.data.sync.SyncService
 import com.atridad.ascently.service.SessionTrackingService
+import com.atridad.ascently.utils.AppLogger
 import com.atridad.ascently.utils.ImageUtils
 import com.atridad.ascently.widget.ClimbStatsWidgetProvider
 import java.io.File
@@ -192,7 +193,7 @@ class ClimbViewModel(
                 }
             }
 
-            println("Deleted $deletedCount image files and cleared image references")
+            AppLogger.i("ClimbViewModel") { "Deleted $deletedCount image files and cleared image references" }
         }
     }
 
@@ -233,12 +234,12 @@ class ClimbViewModel(
     // Active session management
     fun startSession(context: Context, gymId: String, notes: String? = null) {
         viewModelScope.launch {
-            android.util.Log.d("ClimbViewModel", "startSession called with gymId: $gymId")
+            AppLogger.d("ClimbViewModel") { "startSession called with gymId: $gymId" }
 
             if (!com.atridad.ascently.utils.NotificationPermissionUtils
                     .isNotificationPermissionGranted(context)
             ) {
-                android.util.Log.d("ClimbViewModel", "Notification permission not granted")
+                AppLogger.d("ClimbViewModel") { "Notification permission not granted" }
                 _uiState.value =
                     _uiState.value.copy(
                         error =
@@ -249,10 +250,7 @@ class ClimbViewModel(
 
             val existingActive = repository.getActiveSession()
             if (existingActive != null) {
-                android.util.Log.d(
+                AppLogger.d("ClimbViewModel") { "Active session already exists: ${existingActive.id}" }
-                        "ClimbViewModel",
-                        "Active session already exists: ${existingActive.id}"
-                )
                 _uiState.value =
                     _uiState.value.copy(
                         error = "There's already an active session. Please end it first."
@@ -260,14 +258,11 @@ class ClimbViewModel(
                 return@launch
             }
 
-            android.util.Log.d("ClimbViewModel", "Creating new session")
+            AppLogger.d("ClimbViewModel") { "Creating new session" }
             val newSession = ClimbSession.create(gymId = gymId, notes = notes)
             repository.insertSession(newSession)
 
-            android.util.Log.d(
+            AppLogger.d("ClimbViewModel") { "Starting tracking service for session: ${newSession.id}" }
-                    "ClimbViewModel",
-                    "Starting tracking service for session: ${newSession.id}"
-            )
             // Start the tracking service
             val serviceIntent = SessionTrackingService.createStartIntent(context, newSession.id)
             context.startForegroundService(serviceIntent)
@@ -477,15 +472,12 @@ class ClimbViewModel(
 
                 result.onFailure { error ->
                     if (healthConnectManager.isReadySync()) {
-                        android.util.Log.w(
+                        AppLogger.w("ClimbViewModel") { "Health Connect sync failed: ${error.message}" }
-                                "ClimbViewModel",
-                                "Health Connect sync failed: ${error.message}"
-                        )
                     }
                 }
             } catch (e: Exception) {
                 if (healthConnectManager.isReadySync()) {
-                    android.util.Log.w("ClimbViewModel", "Health Connect sync error: ${e.message}")
+                    AppLogger.w("ClimbViewModel") { "Health Connect sync error: ${e.message}" }
                 }
             }
         }

android/app/src/main/java/com/atridad/ascently/utils/AppLogger.kt

@@ -0,0 +1,48 @@
+package com.atridad.ascently.utils
+
+import android.util.Log
+import com.atridad.ascently.BuildConfig
+
+object AppLogger {
+
+    private const val DEFAULT_TAG = "Ascently"
+
+    enum class Level(val androidLevel: Int) {
+        DEBUG(Log.DEBUG),
+        INFO(Log.INFO),
+        WARN(Log.WARN),
+        ERROR(Log.ERROR)
+    }
+
+    fun d(tag: String = DEFAULT_TAG, messageProvider: () -> String) {
+        log(Level.DEBUG, tag, messageProvider)
+    }
+
+    fun i(tag: String = DEFAULT_TAG, messageProvider: () -> String) {
+        log(Level.INFO, tag, messageProvider)
+    }
+
+    fun w(tag: String = DEFAULT_TAG, throwable: Throwable? = null, messageProvider: () -> String) {
+        log(Level.WARN, tag, messageProvider, throwable)
+    }
+
+    fun e(tag: String = DEFAULT_TAG, throwable: Throwable? = null, messageProvider: () -> String) {
+        log(Level.ERROR, tag, messageProvider, throwable)
+    }
+
+    private fun log(
+        level: Level,
+        tag: String,
+        messageProvider: () -> String,
+        throwable: Throwable? = null
+    ) {
+        if (!BuildConfig.DEBUG) return
+
+        val message = messageProvider()
+        if (throwable != null) {
+            Log.println(level.androidLevel, tag, "$message\n${Log.getStackTraceString(throwable)}")
+        } else {
+            Log.println(level.androidLevel, tag, message)
+        }
+    }
+}

android/app/src/main/java/com/atridad/ascently/utils/ImageUtils.kt

@@ -6,7 +6,6 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.ImageDecoder
 import android.net.Uri
-import android.util.Log
 import androidx.core.graphics.scale
 import androidx.exifinterface.media.ExifInterface
 import java.io.File
@@ -73,7 +72,7 @@ object ImageUtils {
             compressedBitmap.recycle()
             true
         } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Error saving image with EXIF data" }
             false
         }
     }
@@ -119,7 +118,7 @@ object ImageUtils {
             val file = getImageFile(context, relativePath)
             file.delete()
         } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Failed to delete image: $relativePath" }
             false
         }
     }
@@ -137,7 +136,7 @@ object ImageUtils {
             sourceFile.copyTo(destFile, overwrite = true)
             "$IMAGES_DIR/$filename"
         } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Failed to import image from source: ${sourceFile.name}" }
             null
         }
     }
@@ -157,7 +156,7 @@ object ImageUtils {
             }
                 ?: emptyList()
         } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Failed to enumerate images directory" }
             emptyList()
         }
     }
@@ -178,7 +177,7 @@ object ImageUtils {
 
             tempFilename
         } catch (e: Exception) {
-            Log.e("ImageUtils", "Error saving temporary image from URI", e)
+            AppLogger.e("ImageUtils", e) { "Error saving temporary image from URI" }
             null
         }
     }
@@ -193,7 +192,7 @@ object ImageUtils {
         return try {
             val tempFile = File(getImagesDirectory(context), tempFilename)
             if (!tempFile.exists()) {
-                Log.e("ImageUtils", "Temporary file does not exist: $tempFilename")
+                AppLogger.e("ImageUtils") { "Temporary file does not exist: $tempFilename" }
                 return null
             }
 
@@ -202,17 +201,14 @@ object ImageUtils {
             val finalFile = File(getImagesDirectory(context), deterministicFilename)
 
             if (tempFile.renameTo(finalFile)) {
-                Log.d(
+                AppLogger.d("ImageUtils") { "Renamed temporary image: $tempFilename -> $deterministicFilename" }
-                        "ImageUtils",
-                        "Renamed temporary image: $tempFilename -> $deterministicFilename"
-                )
                 deterministicFilename
             } else {
-                Log.e("ImageUtils", "Failed to rename temporary image: $tempFilename")
+                AppLogger.e("ImageUtils") { "Failed to rename temporary image: $tempFilename" }
                 null
             }
         } catch (e: Exception) {
-            Log.e("ImageUtils", "Error renaming temporary image", e)
+            AppLogger.e("ImageUtils", e) { "Error renaming temporary image" }
             null
         }
     }
@@ -249,7 +245,7 @@ object ImageUtils {
                     destExif.saveAttributes()
                 } catch (e: Exception) {
                     // If EXIF preservation fails, continue without it
-                    Log.w("ImageUtils", "Failed to preserve EXIF data: ${e.message}")
+                    AppLogger.w("ImageUtils") { "Failed to preserve EXIF data: ${e.message}" }
                 }
 
                 bitmap.recycle()
@@ -262,7 +258,7 @@ object ImageUtils {
             // Return relative path
             "$IMAGES_DIR/$filename"
         } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Failed to save image from bytes: $filename" }
             null
         }
     }
@@ -275,7 +271,7 @@ object ImageUtils {
 
             orphanedImages.forEach { path -> deleteImage(context, path) }
         } catch (e: Exception) {
-            e.printStackTrace()
+            AppLogger.e("ImageUtils", e) { "Failed to clean up orphaned images" }
         }
     }
 }

android/app/src/main/java/com/atridad/ascently/utils/MigrationManager.kt

@@ -2,7 +2,6 @@ package com.atridad.ascently.utils
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
 import androidx.core.content.edit
 
 class MigrationManager(private val context: Context) {
@@ -22,11 +21,11 @@ class MigrationManager(private val context: Context) {
      */
     fun migrateIfNeeded() {
         if (migrationPrefs.getBoolean(MIGRATION_COMPLETED_KEY, false)) {
-            Log.d(TAG, "Migration already completed, skipping")
+            AppLogger.d(TAG) { "Migration already completed, skipping" }
             return
         }
 
-        Log.i(TAG, "🔄 Starting migration from OpenClimb to Ascently...")
+        AppLogger.i(TAG) { "🔄 Starting migration from OpenClimb to Ascently..." }
         var migrationCount = 0
 
         // Migrate SharedPreferences
@@ -36,12 +35,9 @@ class MigrationManager(private val context: Context) {
         migrationPrefs.edit { putBoolean(MIGRATION_COMPLETED_KEY, true) }
 
         if (migrationCount > 0) {
-            Log.i(
+            AppLogger.i(TAG) { "🎉 Migration completed! Migrated $migrationCount items from OpenClimb to Ascently" }
-                    TAG,
-                    "🎉 Migration completed! Migrated $migrationCount items from OpenClimb to Ascently"
-            )
         } else {
-            Log.i(TAG, "ℹ️ No OpenClimb data found to migrate")
+            AppLogger.i(TAG) { "ℹ️ No OpenClimb data found to migrate" }
         }
     }
 
@@ -95,10 +91,7 @@ class MigrationManager(private val context: Context) {
             // Clear old preferences
             oldPrefs.edit { clear() }
 
-            Log.d(
+            AppLogger.d(TAG) { "Migrated preference file: $oldFileName → $newFileName (${oldPrefs.all.size} keys)" }
-                    TAG,
-                    "✅ Migrated preference file: $oldFileName → $newFileName (${oldPrefs.all.size} keys)"
-            )
             return oldPrefs.all.size
         }
 
@@ -150,7 +143,7 @@ class MigrationManager(private val context: Context) {
                     }
                 }
 
-                Log.d(TAG, "✅ Migrated ${keysToMigrate.size} keys in $prefFileName")
+                AppLogger.d(TAG) { "Migrated ${keysToMigrate.size} keys in $prefFileName" }
                 count += keysToMigrate.size
             }
         }
@@ -166,6 +159,6 @@ class MigrationManager(private val context: Context) {
     /** Reset migration state (for testing purposes) */
     fun resetMigrationState() {
         migrationPrefs.edit { putBoolean(MIGRATION_COMPLETED_KEY, false) }
-        Log.d(TAG, "Migration state reset")
+        AppLogger.d(TAG) { "Migration state reset" }
     }
 }

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

@@ -52,7 +52,8 @@ object ZipExportImportUtils {
                 zipOut.closeEntry()
 
                 // Add JSON data file
-                val json = Json {
+                val json =
+                    Json {
                         prettyPrint = true
                         ignoreUnknownKeys = true
                     }
@@ -78,24 +79,21 @@ object ZipExportImportUtils {
                             zipOut.closeEntry()
                             successfulImages++
                         } else {
-                            android.util.Log.w(
+                            AppLogger.w("ZipExportImportUtils") {
-                                    "ZipExportImportUtils",
                                 "Image file not found or empty: $imagePath"
-                            )
+                            }
                         }
                     } catch (e: Exception) {
-                        android.util.Log.e(
+                        AppLogger.e("ZipExportImportUtils", e) {
-                                "ZipExportImportUtils",
                             "Failed to add image $imagePath: ${e.message}"
-                        )
+                        }
                     }
                 }
 
                 // Log export summary
-                android.util.Log.i(
+                AppLogger.i("ZipExportImportUtils") {
-                        "ZipExportImportUtils",
                     "Export completed: ${successfulImages}/${referencedImagePaths.size} images included"
-                )
+                }
             }
 
             // Validate the created ZIP file
@@ -131,7 +129,8 @@ object ZipExportImportUtils {
                     zipOut.closeEntry()
 
                     // Add JSON data file
-                    val json = Json {
+                    val json =
+                        Json {
                             prettyPrint = true
                             ignoreUnknownKeys = true
                         }
@@ -158,17 +157,15 @@ object ZipExportImportUtils {
                                 successfulImages++
                             }
                         } catch (e: Exception) {
-                            android.util.Log.e(
+                            AppLogger.e("ZipExportImportUtils", e) {
-                                    "ZipExportImportUtils",
                                 "Failed to add image $imagePath: ${e.message}"
-                            )
+                            }
                         }
                     }
 
-                    android.util.Log.i(
+                    AppLogger.i("ZipExportImportUtils") {
-                            "ZipExportImportUtils",
                         "Export to URI completed: ${successfulImages}/${referencedImagePaths.size} images included"
-                    )
+                    }
                 }
             }
                 ?: throw IOException("Could not open output stream")
@@ -217,16 +214,17 @@ object ZipExportImportUtils {
                             // Read metadata for validation
                             val metadataContent = zipIn.readBytes().toString(Charsets.UTF_8)
                             foundRequiredFiles.add("metadata")
-                            android.util.Log.i(
+                            AppLogger.i("ZipExportImportUtils") {
-                                    "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/")
@@ -248,37 +246,33 @@ object ZipExportImportUtils {
                                     val newPath = ImageUtils.importImageFile(context, tempFile)
                                     if (newPath != null) {
                                         importedImagePaths[originalFilename] = newPath
-                                        android.util.Log.d(
+                                        AppLogger.d("ZipExportImportUtils") {
-                                                "ZipExportImportUtils",
                                             "Successfully imported image: $originalFilename -> $newPath"
-                                        )
-                                    } else {
-                                        android.util.Log.w(
-                                                "ZipExportImportUtils",
-                                                "Failed to import image: $originalFilename"
-                                        )
                                         }
                                     } else {
-                                    android.util.Log.w(
+                                        AppLogger.w("ZipExportImportUtils") {
-                                            "ZipExportImportUtils",
+                                            "Failed to import image: $originalFilename"
+                                        }
+                                    }
+                                } else {
+                                    AppLogger.w("ZipExportImportUtils") {
                                         "Extracted image is empty: $originalFilename"
-                                    )
+                                    }
                                 }
 
                                 // Clean up temp file
                                 tempFile.delete()
                             } catch (e: Exception) {
-                                android.util.Log.e(
+                                AppLogger.e("ZipExportImportUtils", e) {
-                                        "ZipExportImportUtils",
                                     "Failed to process image $originalFilename: ${e.message}"
-                                )
                                 }
                             }
+                        }
+
                         else -> {
-                            android.util.Log.d(
+                            AppLogger.d("ZipExportImportUtils") {
-                                    "ZipExportImportUtils",
                                 "Skipping ZIP entry: ${entry.name}"
-                            )
+                            }
                         }
                     }
 
@@ -296,10 +290,9 @@ object ZipExportImportUtils {
                 throw IOException("Invalid ZIP file: data.json is empty")
             }
 
-            android.util.Log.i(
+            AppLogger.i("ZipExportImportUtils") {
-                    "ZipExportImportUtils",
                 "Import extraction completed: ${importedImagePaths.size} images processed"
-            )
+            }
 
             return ImportResult(jsonContent, importedImagePaths)
         } catch (e: Exception) {

android/app/src/main/java/com/atridad/ascently/widget/ClimbStatsWidgetProvider.kt

@@ -11,6 +11,7 @@ import com.atridad.ascently.MainActivity
 import com.atridad.ascently.R
 import com.atridad.ascently.data.database.AscentlyDatabase
 import com.atridad.ascently.data.repository.ClimbRepository
+import java.time.LocalDate
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -48,53 +49,47 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() {
                 val database = AscentlyDatabase.getDatabase(context)
                 val repository = ClimbRepository(database, context)
 
-                // Fetch stats data
+                // Get last 7 days date range (rolling period)
+                val today = LocalDate.now()
+                val sevenDaysAgo = today.minusDays(6) // Today + 6 days ago = 7 days total
+
+                // Fetch all sessions and attempts
                 val sessions = repository.getAllSessions().first()
-                val problems = repository.getAllProblems().first()
                 val attempts = repository.getAllAttempts().first()
-                val gyms = repository.getAllGyms().first()
 
-                // Calculate stats
+                // Filter for last 7 days across all gyms
-                val completedSessions = sessions.filter { it.endTime != null }
+                val weekSessions =
-
+                        sessions.filter { session ->
-                // Count problems that have been completed (have at least one successful attempt)
+                            try {
-                val completedProblems =
+                                val sessionDate = LocalDate.parse(session.date.substring(0, 10))
-                        problems
+                                !sessionDate.isBefore(sevenDaysAgo) && !sessionDate.isAfter(today)
-                                .filter { problem ->
+                            } catch (_: Exception) {
-                                    attempts.any { attempt ->
+                                false
-                                        attempt.problemId == problem.id &&
-                                                (attempt.result ==
-                                                        com.atridad.ascently.data.model
-                                                                .AttemptResult.SUCCESS ||
-                                                        attempt.result ==
-                                                                com.atridad.ascently.data.model
-                                                                        .AttemptResult.FLASH)
                             }
                         }
-                                .size
 
-                val favoriteGym =
+                val weekSessionIds = weekSessions.map { it.id }.toSet()
-                        sessions.groupBy { it.gymId }.maxByOrNull { it.value.size }?.let {
+
-                                (gymId, _) ->
+                // Count total attempts this week
-                            gyms.find { it.id == gymId }?.name
+                val totalAttempts =
-                        }
+                        attempts.count { attempt -> weekSessionIds.contains(attempt.sessionId) }
-                                ?: "No sessions yet"
+
+                // Count sessions this week
+                val totalSessions = weekSessions.size
 
                 launch(Dispatchers.Main) {
                     val views = RemoteViews(context.packageName, R.layout.widget_climb_stats)
 
-                    views.setTextViewText(
+                    // Set weekly stats
-                            R.id.widget_total_sessions,
+                    views.setTextViewText(R.id.widget_attempts_value, totalAttempts.toString())
-                            completedSessions.size.toString()
+                    views.setTextViewText(R.id.widget_sessions_value, totalSessions.toString())
-                    )
-                    views.setTextViewText(
-                            R.id.widget_problems_completed,
-                            completedProblems.toString()
-                    )
-                    views.setTextViewText(R.id.widget_total_problems, problems.size.toString())
-                    views.setTextViewText(R.id.widget_favorite_gym, favoriteGym)
 
-                    val intent = Intent(context, MainActivity::class.java)
+                    val intent =
+                            Intent(context, MainActivity::class.java).apply {
+                                flags =
+                                        Intent.FLAG_ACTIVITY_NEW_TASK or
+                                                Intent.FLAG_ACTIVITY_CLEAR_TOP
+                            }
                     val pendingIntent =
                             PendingIntent.getActivity(
                                     context,
@@ -110,10 +105,8 @@ class ClimbStatsWidgetProvider : AppWidgetProvider() {
             } catch (_: Exception) {
                 launch(Dispatchers.Main) {
                     val views = RemoteViews(context.packageName, R.layout.widget_climb_stats)
-                    views.setTextViewText(R.id.widget_total_sessions, "0")
+                    views.setTextViewText(R.id.widget_attempts_value, "0")
-                    views.setTextViewText(R.id.widget_problems_completed, "0")
+                    views.setTextViewText(R.id.widget_sessions_value, "0")
-                    views.setTextViewText(R.id.widget_total_problems, "0")
-                    views.setTextViewText(R.id.widget_favorite_gym, "No data")
 
                     val intent = Intent(context, MainActivity::class.java)
                     val pendingIntent =

android/app/src/main/res/drawable/ic_checkmark_circle.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22C17.52,22 22,17.52 22,12C22,6.48 17.52,2 12,2ZM10,17L5,12L6.41,10.59L10,14.17L17.59,6.58L19,8L10,17Z"/>
+</vector>

android/app/src/main/res/drawable/ic_circle_filled.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M9,11.24V7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5C7,9.06 7.79,10.43 9,11.24zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11H13v-6C13,6.67 12.33,6 11.5,6S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03c-0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8l4.94,4.94C9.96,23.83 10.34,24 10.75,24h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2C19.75,16.63 19.37,16.09 18.84,15.87z"/>
+</vector>

android/app/src/main/res/layout/widget_climb_stats.xml

@@ -5,190 +5,84 @@
     android:layout_height="match_parent"
     android:background="@drawable/widget_background"
     android:orientation="vertical"
-    android:padding="12dp">
+    android:padding="12dp"
+    android:gravity="center">
 
-    <!-- Header -->
+    <!-- Header with icon and "Weekly" text -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
         android:orientation="horizontal"
+        android:gravity="center_vertical"
         android:layout_marginBottom="12dp">
 
         <ImageView
-            android:layout_width="24dp"
+            android:layout_width="28dp"
-            android:layout_height="24dp"
+            android:layout_height="28dp"
             android:src="@drawable/ic_mountains"
             android:tint="@color/widget_primary"
-            android:layout_marginEnd="8dp" />
+            android:layout_marginEnd="8dp"
+            android:contentDescription="@string/ascently_icon" />
 
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:text="@string/weekly"
-            android:text="Ascently"
+            android:textSize="18sp"
-            android:textSize="16sp"
+            android:textColor="@color/widget_text_primary" />
+
+    </LinearLayout>
+
+    <!-- Attempts Row -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginBottom="12dp">
+
+        <ImageView
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:src="@drawable/ic_circle_filled"
+            android:tint="@color/widget_primary"
+            android:layout_marginEnd="12dp"
+            android:contentDescription="Attempts icon" />
+
+        <TextView
+            android:id="@+id/widget_attempts_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:textSize="40sp"
             android:textStyle="bold"
             android:textColor="@color/widget_text_primary" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Climbing Stats"
-            android:textSize="12sp"
-            android:textColor="@color/widget_text_secondary" />
-
     </LinearLayout>
 
-    <!-- Stats Grid -->
+    <!-- Sessions Row -->
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:gravity="center">
-
-        <!-- Top Row -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
         android:orientation="horizontal"
-            android:layout_marginBottom="8dp">
+        android:gravity="center_vertical">
 
-            <!-- Sessions Card -->
+        <ImageView
-            <LinearLayout
+            android:layout_width="32dp"
-                android:layout_width="0dp"
+            android:layout_height="32dp"
-                android:layout_height="match_parent"
+            android:src="@drawable/ic_play_arrow_24"
-                android:layout_weight="1"
+            android:tint="@color/widget_primary"
-                android:orientation="vertical"
+            android:layout_marginEnd="12dp"
-                android:gravity="center"
+            android:contentDescription="@string/sessions_icon" />
-                android:background="@drawable/widget_stat_card_background"
-                android:layout_marginEnd="4dp"
-                android:padding="12dp">
 
         <TextView
-                    android:id="@+id/widget_total_sessions"
+            android:id="@+id/widget_sessions_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-                    android:text="0"
+            android:text="@string/_0"
-                    android:textSize="22sp"
+            android:textSize="40sp"
             android:textStyle="bold"
-                    android:textColor="@color/widget_primary" />
+            android:textColor="@color/widget_text_primary" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Sessions"
-                    android:textSize="12sp"
-                    android:textColor="@color/widget_text_secondary"
-                    android:layout_marginTop="2dp" />
-
-            </LinearLayout>
-
-            <!-- Problems Card -->
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:gravity="center"
-                android:background="@drawable/widget_stat_card_background"
-                android:layout_marginStart="4dp"
-                android:padding="12dp">
-
-                <TextView
-                    android:id="@+id/widget_problems_completed"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="0"
-                    android:textSize="22sp"
-                    android:textStyle="bold"
-                    android:textColor="@color/widget_primary" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Completed"
-                    android:textSize="12sp"
-                    android:textColor="@color/widget_text_secondary"
-                    android:layout_marginTop="2dp" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <!-- Bottom Row -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <!-- Success Rate Card -->
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:gravity="center"
-                android:background="@drawable/widget_stat_card_background"
-                android:layout_marginEnd="4dp"
-                android:padding="12dp">
-
-                <TextView
-                    android:id="@+id/widget_total_problems"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="0"
-                    android:textSize="22sp"
-                    android:textStyle="bold"
-                    android:textColor="@color/widget_secondary" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Problems"
-                    android:textSize="12sp"
-                    android:textColor="@color/widget_text_secondary"
-                    android:layout_marginTop="2dp" />
-
-            </LinearLayout>
-
-            <!-- Favorite Gym Card -->
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:gravity="center"
-                android:background="@drawable/widget_stat_card_background"
-                android:layout_marginStart="4dp"
-                android:padding="12dp">
-
-                <TextView
-                    android:id="@+id/widget_favorite_gym"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="No gyms"
-                    android:textSize="13sp"
-                    android:textStyle="bold"
-                    android:textColor="@color/widget_accent"
-                    android:gravity="center"
-                    android:maxLines="2"
-                    android:ellipsize="end" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Favorite"
-                    android:textSize="12sp"
-                    android:textColor="@color/widget_text_secondary"
-                    android:layout_marginTop="2dp" />
-
-            </LinearLayout>
-
-        </LinearLayout>
 
     </LinearLayout>
 

android/app/src/main/res/values/strings.xml

@@ -12,5 +12,9 @@
     <string name="shortcut_end_session_disabled">No active session to end</string>
 
     <!-- Widget -->
-    <string name="widget_description">View your climbing stats at a glance</string>
+    <string name="widget_description">View your weekly climbing stats</string>
+    <string name="ascently_icon">Ascently icon</string>
+    <string name="weekly">Weekly</string>
+    <string name="sessions_icon">Sessions icon</string>
+    <string name="_0">0</string>
 </resources>

android/app/src/main/res/xml/widget_climb_stats_info.xml

@@ -3,15 +3,14 @@
     android:description="@string/widget_description"
     android:initialKeyguardLayout="@layout/widget_climb_stats"
     android:initialLayout="@layout/widget_climb_stats"
-    android:minWidth="250dp"
+    android:minWidth="110dp"
-    android:minHeight="180dp"
+    android:minHeight="110dp"
+    android:maxResizeWidth="110dp"
+    android:maxResizeHeight="110dp"
     android:previewImage="@drawable/ic_mountains"
     android:previewLayout="@layout/widget_climb_stats"
-    android:resizeMode="horizontal|vertical"
+    android:resizeMode="none"
-    android:targetCellWidth="4"
+    android:targetCellWidth="2"
     android:targetCellHeight="2"
     android:updatePeriodMillis="1800000"
-    android:widgetCategory="home_screen"
+    android:widgetCategory="home_screen" />
-    android:widgetFeatures="reconfigurable"
-    android:maxResizeWidth="320dp"
-    android:maxResizeHeight="240dp" />

android/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 agp = "8.12.3"
-kotlin = "2.2.20"
+kotlin = "2.2.21"
 coreKtx = "1.17.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
@@ -9,17 +9,17 @@ androidxTestCore = "1.7.0"
 androidxTestExt = "1.3.0"
 androidxTestRunner = "1.7.0"
 androidxTestRules = "1.7.0"
-lifecycleRuntimeKtx = "2.9.4"
+lifecycleRuntimeKtx = "2.10.0"
-activityCompose = "1.11.0"
+activityCompose = "1.12.0"
-composeBom = "2025.10.00"
+composeBom = "2025.11.01"
-room = "2.8.2"
+room = "2.8.4"
-navigation = "2.9.5"
+navigation = "2.9.6"
-viewmodel = "2.9.4"
+viewmodel = "2.10.0"
 kotlinxSerialization = "1.9.0"
 kotlinxCoroutines = "1.10.2"
 coil = "2.7.0"
 ksp = "2.2.20-2.0.3"
-exifinterface = "1.3.6"
+exifinterface = "1.4.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

docs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ascently-docs",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Documentation site for Ascently - FOSS climbing tracking app",
   "repository": {
     "type": "git",
@@ -25,9 +25,13 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^9.5.0",
+    "@astrojs/node": "^9.5.1",
-    "@astrojs/starlight": "^0.36.1",
+    "@astrojs/starlight": "^0.37.0",
-    "astro": "^5.14.5",
+    "astro": "^5.16.3",
-    "sharp": "^0.34.4"
+    "qrcode": "^1.5.4",
+    "sharp": "^0.34.5"
+  },
+  "devDependencies": {
+    "@types/qrcode": "^1.5.6"
   }
 }

docs/src/components/DownloadButtons.astro

@@ -0,0 +1,155 @@
+---
+import { Tabs, TabItem } from "@astrojs/starlight/components";
+import { Card, CardGrid } from "@astrojs/starlight/components";
+import { LinkButton } from "@astrojs/starlight/components";
+import { Badge } from "@astrojs/starlight/components";
+import QRCode from "./QRCode.astro";
+import { downloadLinks, requirements } from "../config";
+
+interface Props {
+    showQR?: boolean;
+}
+
+const { showQR = false } = Astro.props;
+
+const hasLink = (link: string | undefined) => link && link.trim() !== "";
+---
+
+<Tabs syncKey="platform">
+    <TabItem label="Android" icon="star">
+        <CardGrid>
+            {
+                hasLink(downloadLinks.android.playStore) && (
+                    <Card title="Google Play Store" icon="star">
+                        <p style="text-align: center;">
+                            <LinkButton
+                                href={downloadLinks.android.playStore}
+                                variant="primary"
+                                icon="external"
+                            >
+                                Get on Play Store
+                            </LinkButton>
+                        </p>
+                        {showQR && (
+                            <p style="text-align: center;">
+                                <QRCode
+                                    data={downloadLinks.android.playStore}
+                                    size={200}
+                                    alt="QR code for Play Store"
+                                />
+                            </p>
+                        )}
+                    </Card>
+                )
+            }
+
+            {
+                hasLink(downloadLinks.android.obtainium) && (
+                    <Card title="Obtainium" icon="rocket">
+                        <p style="text-align: center;">
+                            <LinkButton
+                                href={downloadLinks.android.obtainium}
+                                variant="primary"
+                                icon="external"
+                            >
+                                Get on Obtainium
+                            </LinkButton>
+                        </p>
+                        {showQR && (
+                            <p style="text-align: center;">
+                                <QRCode
+                                    data={downloadLinks.android.obtainium}
+                                    size={200}
+                                    alt="QR code for Obtainium"
+                                />
+                            </p>
+                        )}
+                    </Card>
+                )
+            }
+
+            {
+                hasLink(downloadLinks.android.releases) && (
+                    <Card title="Direct Download" icon="download">
+                        <p style="text-align: center;">
+                            <LinkButton
+                                href={downloadLinks.android.releases}
+                                variant="secondary"
+                                icon="external"
+                            >
+                                Download APK
+                            </LinkButton>
+                        </p>
+                        {showQR && (
+                            <p style="text-align: center;">
+                                <QRCode
+                                    data={downloadLinks.android.releases}
+                                    size={200}
+                                    alt="QR code for APK download"
+                                />
+                            </p>
+                        )}
+                    </Card>
+                )
+            }
+        </CardGrid>
+
+        <p><strong>Requirements:</strong> {requirements.android}</p>
+    </TabItem>
+
+    <TabItem label="iOS" icon="apple">
+        <CardGrid>
+            {
+                hasLink(downloadLinks.ios.appStore) && (
+                    <Card title="App Store" icon="rocket">
+                        <p style="text-align: center;">
+                            <LinkButton
+                                href={downloadLinks.ios.appStore}
+                                variant="primary"
+                                icon="external"
+                            >
+                                Download on App Store
+                            </LinkButton>
+                        </p>
+                        {showQR && (
+                            <p style="text-align: center;">
+                                <QRCode
+                                    data={downloadLinks.ios.appStore}
+                                    size={200}
+                                    alt="QR code for App Store"
+                                />
+                            </p>
+                        )}
+                    </Card>
+                )
+            }
+
+            {
+                hasLink(downloadLinks.ios.testFlight) && (
+                    <Card title="TestFlight Beta" icon="warning">
+                        <p style="text-align: center;">
+                            <LinkButton
+                                href={downloadLinks.ios.testFlight}
+                                variant="secondary"
+                                icon="external"
+                            >
+                                Join TestFlight
+                            </LinkButton>
+                        </p>
+                        {showQR && (
+                            <p style="text-align: center;">
+                                <QRCode
+                                    data={downloadLinks.ios.testFlight}
+                                    size={200}
+                                    alt="QR code for TestFlight"
+                                />
+                            </p>
+                        )}
+                    </Card>
+                )
+            }
+        </CardGrid>
+
+        <p><strong>Requirements:</strong> {requirements.ios}</p>
+    </TabItem>
+</Tabs>

docs/src/components/QRCode.astro

@@ -0,0 +1,111 @@
+---
+import * as QR from "qrcode";
+
+interface Props {
+    data: string;
+    size?: number;
+    alt?: string;
+}
+
+const { data, size = 200, alt = "QR Code" } = Astro.props;
+
+// Generate QR code for dark mode
+let darkModeQR = "";
+try {
+    darkModeQR = await QR.toDataURL(data, {
+        width: size,
+        margin: 2,
+        color: {
+            dark: "#FFBF00",
+            light: "#17181C",
+        },
+    });
+} catch (err) {
+    console.error("Failed to generate dark mode QR code:", err);
+}
+
+// Generate QR code for light mode
+let lightModeQR = "";
+try {
+    lightModeQR = await QR.toDataURL(data, {
+        width: size,
+        margin: 2,
+        color: {
+            dark: "#F24B3C",
+            light: "#FFFFFF",
+        },
+    });
+} catch (err) {
+    console.error("Failed to generate light mode QR code:", err);
+}
+
+const uniqueId = `qr-${Math.random().toString(36).substr(2, 9)}`;
+---
+
+{
+    (darkModeQR || lightModeQR) && (
+        <img
+            id={uniqueId}
+            alt={alt}
+            width={size}
+            height={size}
+            data-light-src={lightModeQR}
+            data-dark-src={darkModeQR}
+            style="margin: auto;"
+        />
+    )
+}
+
+<script is:inline define:vars={{ uniqueId, lightModeQR, darkModeQR }}>
+    (function () {
+        const img = document.getElementById(uniqueId);
+        if (!img) return;
+
+        const theme = document.documentElement.getAttribute("data-theme");
+        if (theme === "dark" && darkModeQR) {
+            img.setAttribute("src", darkModeQR);
+        } else if (lightModeQR) {
+            img.setAttribute("src", lightModeQR);
+        }
+    })();
+</script>
+
+<script>
+    function updateQRCodes() {
+        const theme = document.documentElement.getAttribute("data-theme");
+        const qrImages = document.querySelectorAll(
+            "img[data-light-src][data-dark-src]",
+        );
+
+        qrImages.forEach((img) => {
+            const lightSrc = img.getAttribute("data-light-src");
+            const darkSrc = img.getAttribute("data-dark-src");
+
+            if (theme === "dark" && darkSrc) {
+                img.setAttribute("src", darkSrc);
+            } else if (lightSrc) {
+                img.setAttribute("src", lightSrc);
+            }
+        });
+    }
+
+    // Set initial theme on page load
+    updateQRCodes();
+
+    // Watch for theme changes
+    const observer = new MutationObserver((mutations) => {
+        mutations.forEach((mutation) => {
+            if (
+                mutation.type === "attributes" &&
+                mutation.attributeName === "data-theme"
+            ) {
+                updateQRCodes();
+            }
+        });
+    });
+
+    observer.observe(document.documentElement, {
+        attributes: true,
+        attributeFilter: ["data-theme"],
+    });
+</script>

docs/src/config.ts

@@ -0,0 +1,17 @@
+export const requirements = {
+  android: "Android 12+",
+  ios: "iOS 17+",
+} as const;
+
+export const downloadLinks = {
+  android: {
+    releases: "https://git.atri.dad/atridad/Ascently/tags?q=Android",
+    obtainium:
+      "https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://git.atri.dad/atridad/Ascently/releases",
+    playStore: "",
+  },
+  ios: {
+    appStore: "https://apps.apple.com/ca/app/ascently/id6753959144",
+    testFlight: "https://testflight.apple.com/join/E2DYRGH8",
+  },
+} as const;

docs/src/content/docs/download.md

@@ -1,26 +0,0 @@
----
-title: Download
-description: Get Ascently on your Android or iOS device
----
-
-## Android
-
-### Option 1: Direct APK Download
-Download the latest APK from the [Releases page](https://git.atri.dad/atridad/Ascently/releases).
-
-### Option 2: Obtainium
-Use Obtainium for automatic updates:
-
-[<img src="https://github.com/ImranR98/Obtainium/blob/main/assets/graphics/badge_obtainium.png?raw=true" alt="Obtainium" height="41">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.atridad.ascently%22%2C%22url%22%3A%22https%3A%2F%2Fgit.atri.dad%2Fatridad%2FAscently%2Freleases%22%2C%22author%22%3A%22git.atri.dad%22%2C%22name%22%3A%22Ascently%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22intermediateLink%5C%22%3A%5B%5D%2C%5C%22customLinkFilterRegex%5C%22%3A%5C%22%5C%22%2C%5C%22filterByLinkText%5C%22%3Afalse%2C%5C%22skipSort%5C%22%3Afalse%2C%5C%22reverseSort%5C%22%3Afalse%2C%5C%22sortByLastLinkSegment%5C%22%3Afalse%2C%5C%22versionExtractWholePage%5C%22%3Afalse%2C%5C%22requestHeader%5C%22%3A%5B%7B%5C%22requestHeader%5C%22%3A%5C%22User-Agent%3A%20Mozilla%2F5.0%20(Linux%3B%20Android%2010%3B%20K)%20AppleWebKit%2F537.36%20(KHTML%2C%20like%20Gecko)%20Chrome%2F114.0.0.0%20Mobile%20Safari%2F537.36%5C%22%7D%5D%2C%5C%22defaultPseudoVersioningMethod%5C%22%3A%5C%22partialAPKHash%5C%22%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22Ascently%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D)
-
-## iOS
-
-### App Store
-Download from the app store [here](https://apps.apple.com/ca/app/ascently/id6753959144)
-
-### TestFlight Beta
-Join the TestFlight beta [here](https://testflight.apple.com/join/E2DYRGH8)
-
-## Requirements
-
-- **Android 12+** or **iOS 17+**

docs/src/content/docs/download.mdx

@@ -0,0 +1,10 @@
+---
+title: Download
+description: Get Ascently on your Android or iOS device
+---
+
+import DownloadButtons from '../../components/DownloadButtons.astro';
+
+Get Ascently on your device and start tracking your climbs today!
+
+<DownloadButtons showQR={true} />

docs/src/content/docs/privacy.md

@@ -5,7 +5,7 @@ description: Ascently's Privacy Policy
 
 **Last updated: September 29, 2025**
 
-This Privacy Policy describes our policies and procedures regarding the collection, use, and disclosure of your information when you use my software.
+This Privacy Policy describes my policies and procedures regarding the collection, use, and disclosure of your information when you use my software.
 
 ## No Data Collection
 
@@ -36,7 +36,7 @@ You may optionally integrate with Apple Health or Android Health Connect to impo
 
 This software does not use cookies, tracking pixels, or any other analytics or tracking mechanisms. Your usage of the software is completely private.
 
-## Contact Us
+## Contact
 
 If you have any questions about this Privacy Policy, you can contact me:
 

ios/Ascently.xcodeproj/LiveActivityManager.swift

@@ -25,7 +25,7 @@ final class LiveActivityManager {
                 pushType: nil
             )
         } catch {
-            print("Failed to start live activity: \(error)")
+            AppLogger.error("Failed to start live activity: \(error)", tag: "LegacyLiveActivityManager")
         }
     }
 

ios/Ascently.xcodeproj/project.pbxproj

@@ -465,7 +465,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				DRIVERKIT_DEPLOYMENT_TARGET = 24.6;
 				ENABLE_PREVIEWS = YES;
@@ -487,7 +487,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.6;
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -513,7 +513,7 @@
 				CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				DRIVERKIT_DEPLOYMENT_TARGET = 24.6;
 				ENABLE_PREVIEWS = YES;
@@ -535,7 +535,7 @@
 					"@executable_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 15.6;
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -602,7 +602,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = SessionStatusLive/Info.plist;
@@ -613,7 +613,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -632,7 +632,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = 4BC9Y2LL4B;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = SessionStatusLive/Info.plist;
@@ -643,7 +643,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.0;
+				MARKETING_VERSION = 2.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

ios/Ascently/AppIntents/AscentlyShortcuts.swift

@@ -0,0 +1,24 @@
+import AppIntents
+
+/// Defines the App Shortcuts available in the Shortcuts app.
+struct AscentlyShortcuts: AppShortcutsProvider {
+
+    static var shortcutTileColor: ShortcutTileColor {
+        .teal
+    }
+
+    static var appShortcuts: [AppShortcut] {
+        return [
+            AppShortcut(
+                intent: ToggleSessionIntent(),
+                phrases: [
+                    "Toggle climb in \(.applicationName)",
+                    "Start or stop climb in \(.applicationName)",
+                    "Climb toggle in \(.applicationName)",
+                ],
+                shortTitle: "Toggle Session",
+                systemImageName: "figure.climbing"
+            )
+        ]
+    }
+}

ios/Ascently/AppIntents/SessionIntentSupport.swift

@@ -0,0 +1,111 @@
+import Foundation
+
+/// User-visible errors that can arise while handling session-related intents.
+enum SessionIntentError: LocalizedError {
+    case noRecentGym
+    case noActiveSession
+    case failedToStartSession
+    case failedToEndSession
+
+    var errorDescription: String? {
+        switch self {
+        case .noRecentGym:
+            return "There's no recent gym to start a session with."
+        case .noActiveSession:
+            return "There isn't an active session to end right now."
+        case .failedToStartSession:
+            return "Ascently couldn't start a new session."
+        case .failedToEndSession:
+            return "Ascently couldn't finish the active session."
+        }
+    }
+}
+
+struct SessionIntentSummary: Sendable {
+    let sessionId: UUID
+    let gymName: String
+    let status: SessionStatus
+}
+
+/// Controller for handling session operations from App Intents.
+@MainActor
+final class SessionIntentController {
+
+    private let dataManager: ClimbingDataManager
+
+    init(dataManager: ClimbingDataManager = .shared) {
+        self.dataManager = dataManager
+    }
+
+    /// Starts a new session using the most recently visited gym.
+    func startSessionWithLastUsedGym() async throws -> SessionIntentSummary {
+        // Wait for data to load
+        if dataManager.gyms.isEmpty {
+            try? await Task.sleep(nanoseconds: 500_000_000)
+        }
+
+        guard let lastGym = dataManager.getLastUsedGym() else {
+            logFailure(.noRecentGym, context: "No recorded sessions available")
+            throw SessionIntentError.noRecentGym
+        }
+
+        guard let startedSession = await dataManager.startSessionAsync(gymId: lastGym.id) else {
+            logFailure(.failedToStartSession, context: "Data manager failed to create new session")
+            throw SessionIntentError.failedToStartSession
+        }
+
+        return SessionIntentSummary(
+            sessionId: startedSession.id,
+            gymName: lastGym.name,
+            status: startedSession.status
+        )
+    }
+
+    /// Ends the currently active climbing session, if one exists.
+    func endActiveSession() async throws -> SessionIntentSummary {
+        guard let activeSession = dataManager.activeSession else {
+            logFailure(.noActiveSession, context: "No active session stored in data manager")
+            throw SessionIntentError.noActiveSession
+        }
+
+        guard let completedSession = await dataManager.endSessionAsync(activeSession.id) else {
+            logFailure(
+                .failedToEndSession, context: "Data manager failed to complete active session")
+            throw SessionIntentError.failedToEndSession
+        }
+
+        guard let gym = dataManager.gym(withId: completedSession.gymId) else {
+            logFailure(
+                .failedToEndSession,
+                context: "Gym missing for completed session \(completedSession.id)")
+            throw SessionIntentError.failedToEndSession
+        }
+
+        return SessionIntentSummary(
+            sessionId: completedSession.id,
+            gymName: gym.name,
+            status: completedSession.status
+        )
+    }
+
+    private func logFailure(_ error: SessionIntentError, context: String) {
+        // Log error for debugging
+        print("SessionIntentError: \(error). Context: \(context)")
+    }
+
+    /// Toggles the session state: ends active session if one exists, otherwise starts a new one.
+    func toggleSession() async throws -> (summary: SessionIntentSummary, wasStarted: Bool) {
+        // Wait for data to load
+        if dataManager.gyms.isEmpty {
+            try? await Task.sleep(nanoseconds: 500_000_000)
+        }
+
+        if dataManager.activeSession != nil {
+            let summary = try await endActiveSession()
+            return (summary, false)
+        } else {
+            let summary = try await startSessionWithLastUsedGym()
+            return (summary, true)
+        }
+    }
+}

ios/Ascently/AppIntents/ToggleSessionIntent.swift

@@ -0,0 +1,40 @@
+import AppIntents
+import Foundation
+
+/// Toggles the climbing session state: starts a session if none is active, or ends the current one.
+struct ToggleSessionIntent: AppIntent {
+
+    static var title: LocalizedStringResource {
+        "Toggle Climbing Session"
+    }
+
+    static var description: IntentDescription {
+        IntentDescription(
+            "Starts a new session at your last gym if you're not climbing, or ends your current session if you are."
+        )
+    }
+
+    static var openAppWhenRun: Bool {
+        false
+    }
+
+    func perform() async throws -> some IntentResult & ProvidesDialog {
+        // Wait for app initialization
+        try? await Task.sleep(nanoseconds: 1_000_000_000)
+
+        let controller = await SessionIntentController()
+        let (summary, wasStarted) = try await controller.toggleSession()
+
+        if wasStarted {
+            // Wait for Live Activity
+            try? await Task.sleep(nanoseconds: 500_000_000)
+            return .result(dialog: IntentDialog("Session started at \(summary.gymName). Have an awesome climb!"))
+        } else {
+            return .result(dialog: IntentDialog("Session at \(summary.gymName) ended. Nice work!"))
+        }
+    }
+
+    static var parameterSummary: some ParameterSummary {
+        Summary("Toggle my climbing session")
+    }
+}

ios/Ascently/AscentlyApp.swift

@@ -1,10 +1,25 @@
 import SwiftUI
 
+class AppDelegate: NSObject, UIApplicationDelegate {
+    func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+    ) -> Bool {
+        return true
+    }
+}
+
 @main
 struct AscentlyApp: App {
+    @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
+    @Environment(\.scenePhase) private var scenePhase
+    @StateObject private var themeManager = ThemeManager()
+
     var body: some Scene {
         WindowGroup {
             ContentView()
+                .environmentObject(themeManager)
+                .tint(themeManager.accentColor)
         }
     }
 }

ios/Ascently/Components/PhotoOptionSheet.swift

@@ -8,6 +8,7 @@ struct PhotoOptionSheet: View {
     let onCameraSelected: () -> Void
     let onPhotoLibrarySelected: () -> Void
     let onDismiss: () -> Void
+    @EnvironmentObject var themeManager: ThemeManager
 
     var body: some View {
         NavigationView {
@@ -29,7 +30,7 @@ struct PhotoOptionSheet: View {
                         HStack {
                             Image(systemName: "photo.on.rectangle")
                                 .font(.title2)
-                                .foregroundColor(.blue)
+                                .foregroundColor(themeManager.accentColor)
                             Text("Photo Library")
                                 .font(.headline)
                             Spacer()
@@ -52,7 +53,7 @@ struct PhotoOptionSheet: View {
                         HStack {
                             Image(systemName: "camera.fill")
                                 .font(.title2)
-                                .foregroundColor(.blue)
+                                .foregroundColor(themeManager.accentColor)
                             Text("Camera")
                                 .font(.headline)
                             Spacer()

ios/Ascently/ContentView.swift

@@ -1,7 +1,7 @@
 import SwiftUI
 
 struct ContentView: View {
-    @StateObject private var dataManager = ClimbingDataManager()
+    @StateObject private var dataManager = ClimbingDataManager.shared
     @State private var selectedTab = 0
     @Environment(\.scenePhase) private var scenePhase
     @State private var notificationObservers: [NSObjectProtocol] = []
@@ -91,11 +91,12 @@ struct ContentView: View {
             object: nil,
             queue: .main
         ) { _ in
-            print("App will enter foreground - preparing Live Activity check")
+            Task { @MainActor in
-            Task {
+                AppLogger.info(
+                    "App will enter foreground - preparing Live Activity check", tag: "Lifecycle")
                 // Small delay to ensure app is fully active
                 try? await Task.sleep(nanoseconds: 800_000_000)  // 0.8 seconds
-                await dataManager.onAppBecomeActive()
+                dataManager.onAppBecomeActive()
                 // Re-verify health integration when returning from background
                 await dataManager.healthKitService.verifyAndRestoreIntegration()
             }
@@ -107,10 +108,11 @@ struct ContentView: View {
             object: nil,
             queue: .main
         ) { _ in
-            print("App did become active - checking Live Activity status")
+            Task { @MainActor in
-            Task {
+                AppLogger.info(
+                    "App did become active - checking Live Activity status", tag: "Lifecycle")
                 try? await Task.sleep(nanoseconds: 300_000_000)  // 0.3 seconds
-                await dataManager.onAppBecomeActive()
+                dataManager.onAppBecomeActive()
                 await dataManager.healthKitService.verifyAndRestoreIntegration()
             }
         }

ios/Ascently/Info.plist

@@ -6,6 +6,7 @@
 	<true/>
 	<key>NSSupportsLiveActivities</key>
 	<true/>
+
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>This app needs access to your photo library to add photos to climbing problems.</string>
 	<key>NSCameraUsageDescription</key>

ios/Ascently/Services/HealthKitService.swift

@@ -38,7 +38,7 @@ class HealthKitService: ObservableObject {
         {
             currentWorkoutStartDate = startDate
             currentWorkoutSessionId = sessionId
-            print("HealthKit: Restored active workout from \(startDate)")
+            AppLogger.info("HealthKit: Restored active workout from \(startDate)", tag: "HealthKit")
         }
     }
 
@@ -56,31 +56,34 @@ class HealthKitService: ObservableObject {
         guard isEnabled else { return }
 
         guard HKHealthStore.isHealthDataAvailable() else {
-            print("HealthKit: Device does not support HealthKit")
+            AppLogger.warning("HealthKit: Device does not support HealthKit", tag: "HealthKit")
             return
         }
 
         checkAuthorization()
 
         if !isAuthorized {
-            print(
+            AppLogger.warning(
-                "HealthKit: Integration was enabled but authorization lost, attempting to restore..."
+                "HealthKit: Integration was enabled but authorization lost, attempting to restore...",
-            )
+                tag: "HealthKit")
 
             do {
                 try await requestAuthorization()
-                print("HealthKit: Authorization restored successfully")
+                AppLogger.info("HealthKit: Authorization restored successfully", tag: "HealthKit")
             } catch {
-                print("HealthKit: Failed to restore authorization: \(error.localizedDescription)")
+                AppLogger.error(
+                    "HealthKit: Failed to restore authorization: \(error.localizedDescription)",
+                    tag: "HealthKit")
             }
         } else {
-            print("HealthKit: Integration verified - authorization is valid")
+            AppLogger.info(
+                "HealthKit: Integration verified - authorization is valid", tag: "HealthKit")
         }
 
         if hasActiveWorkout() {
-            print(
+            AppLogger.info(
-                "HealthKit: Active workout restored - started at \(currentWorkoutStartDate!)"
+                "HealthKit: Active workout restored - started at \(currentWorkoutStartDate!)",
-            )
+                tag: "HealthKit")
         }
     }
 
@@ -130,7 +133,7 @@ class HealthKitService: ObservableObject {
         currentWorkoutStartDate = startDate
         currentWorkoutSessionId = sessionId
         persistActiveWorkout()
-        print("HealthKit: Started workout for session \(sessionId)")
+        AppLogger.info("HealthKit: Started workout for session \(sessionId)", tag: "HealthKit")
     }
 
     func endWorkout(endDate: Date) async throws {
@@ -178,15 +181,17 @@ class HealthKitService: ObservableObject {
             try await builder.endCollection(at: endDate)
             let workout = try await builder.finishWorkout()
 
-            print(
+            AppLogger.info(
-                "HealthKit: Workout saved successfully with id: \(workout?.uuid.uuidString ?? "unknown")"
+                "HealthKit: Workout saved successfully with id: \(workout?.uuid.uuidString ?? "unknown")",
-            )
+                tag: "HealthKit")
 
             currentWorkoutStartDate = nil
             currentWorkoutSessionId = nil
             persistActiveWorkout()
         } catch {
-            print("HealthKit: Failed to save workout: \(error.localizedDescription)")
+            AppLogger.error(
+                "HealthKit: Failed to save workout: \(error.localizedDescription)", tag: "HealthKit"
+            )
             currentWorkoutStartDate = nil
             currentWorkoutSessionId = nil
             persistActiveWorkout()
@@ -199,7 +204,7 @@ class HealthKitService: ObservableObject {
         currentWorkoutStartDate = nil
         currentWorkoutSessionId = nil
         persistActiveWorkout()
-        print("HealthKit: Workout cancelled")
+        AppLogger.info("HealthKit: Workout cancelled", tag: "HealthKit")
     }
 
     func hasActiveWorkout() -> Bool {

ios/Ascently/Services/Sync/SyncMerger.swift

@@ -0,0 +1,181 @@
+import Foundation
+
+struct SyncMerger {
+    private static let logTag = "SyncMerger"
+    
+    static func mergeDataSafely(
+        localBackup: ClimbDataBackup,
+        serverBackup: ClimbDataBackup,
+        dataManager: ClimbingDataManager,
+        imagePathMapping: [String: String]
+    ) throws -> (gyms: [Gym], problems: [Problem], sessions: [ClimbSession], attempts: [Attempt], uniqueDeletions: [DeletedItem]) {
+        
+        // Merge deletion lists first to prevent resurrection of deleted items
+        let localDeletions = dataManager.getDeletedItems()
+        let allDeletions = localDeletions + serverBackup.deletedItems
+        let uniqueDeletions = Array(Set(allDeletions))
+        
+        AppLogger.info("Merging gyms...", tag: logTag)
+        let mergedGyms = mergeGyms(
+            local: dataManager.gyms,
+            server: serverBackup.gyms,
+            deletedItems: uniqueDeletions)
+        
+        AppLogger.info("Merging problems...", tag: logTag)
+        let mergedProblems = try mergeProblems(
+            local: dataManager.problems,
+            server: serverBackup.problems,
+            imagePathMapping: imagePathMapping,
+            deletedItems: uniqueDeletions)
+        
+        AppLogger.info("Merging sessions...", tag: logTag)
+        let mergedSessions = try mergeSessions(
+            local: dataManager.sessions,
+            server: serverBackup.sessions,
+            deletedItems: uniqueDeletions)
+        
+        AppLogger.info("Merging attempts...", tag: logTag)
+        let mergedAttempts = try mergeAttempts(
+            local: dataManager.attempts,
+            server: serverBackup.attempts,
+            deletedItems: uniqueDeletions)
+            
+        return (mergedGyms, mergedProblems, mergedSessions, mergedAttempts, uniqueDeletions)
+    }
+    
+    private static func mergeGyms(local: [Gym], server: [BackupGym], deletedItems: [DeletedItem]) -> [Gym] {
+        var merged = local
+        let deletedGymIds = Set(deletedItems.filter { $0.type == "gym" }.map { $0.id })
+        let localGymIds = Set(local.map { $0.id.uuidString })
+        
+        merged.removeAll { deletedGymIds.contains($0.id.uuidString) }
+        
+        // Add new items from server (excluding deleted ones)
+        for serverGym in server {
+            if let serverGymConverted = try? serverGym.toGym() {
+                let localHasGym = localGymIds.contains(serverGym.id)
+                let isDeleted = deletedGymIds.contains(serverGym.id)
+                
+                if !localHasGym && !isDeleted {
+                    merged.append(serverGymConverted)
+                }
+            }
+        }
+        
+        return merged
+    }
+    
+    private static func mergeProblems(
+        local: [Problem],
+        server: [BackupProblem],
+        imagePathMapping: [String: String],
+        deletedItems: [DeletedItem]
+    ) throws -> [Problem] {
+        var merged = local
+        let deletedProblemIds = Set(deletedItems.filter { $0.type == "problem" }.map { $0.id })
+        let localProblemIds = Set(local.map { $0.id.uuidString })
+        
+        merged.removeAll { deletedProblemIds.contains($0.id.uuidString) }
+        
+        for serverProblem in server {
+            let localHasProblem = localProblemIds.contains(serverProblem.id)
+            let isDeleted = deletedProblemIds.contains(serverProblem.id)
+            
+            if !localHasProblem && !isDeleted {
+                var problemToAdd = serverProblem
+                
+                if !imagePathMapping.isEmpty, let imagePaths = serverProblem.imagePaths, !imagePaths.isEmpty {
+                    let updatedImagePaths = imagePaths.compactMap { oldPath in
+                        imagePathMapping[oldPath] ?? oldPath
+                    }
+                    if updatedImagePaths != imagePaths {
+                        problemToAdd = BackupProblem(
+                            id: serverProblem.id,
+                            gymId: serverProblem.gymId,
+                            name: serverProblem.name,
+                            description: serverProblem.description,
+                            climbType: serverProblem.climbType,
+                            difficulty: serverProblem.difficulty,
+                            tags: serverProblem.tags,
+                            location: serverProblem.location,
+                            imagePaths: updatedImagePaths,
+                            isActive: serverProblem.isActive,
+                            dateSet: serverProblem.dateSet,
+                            notes: serverProblem.notes,
+                            createdAt: serverProblem.createdAt,
+                            updatedAt: serverProblem.updatedAt
+                        )
+                    }
+                }
+                
+                if let serverProblemConverted = try? problemToAdd.toProblem() {
+                    merged.append(serverProblemConverted)
+                }
+            }
+        }
+        
+        return merged
+    }
+    
+    private static func mergeSessions(
+        local: [ClimbSession], server: [BackupClimbSession], deletedItems: [DeletedItem]
+    ) throws -> [ClimbSession] {
+        var merged = local
+        let deletedSessionIds = Set(deletedItems.filter { $0.type == "session" }.map { $0.id })
+        let localSessionIds = Set(local.map { $0.id.uuidString })
+        
+        merged.removeAll { session in
+            deletedSessionIds.contains(session.id.uuidString) && session.status != .active
+        }
+        
+        for serverSession in server {
+            let localHasSession = localSessionIds.contains(serverSession.id)
+            let isDeleted = deletedSessionIds.contains(serverSession.id)
+            
+            if !localHasSession && !isDeleted {
+                if let serverSessionConverted = try? serverSession.toClimbSession() {
+                    merged.append(serverSessionConverted)
+                }
+            }
+        }
+        
+        return merged
+    }
+    
+    private static func mergeAttempts(
+        local: [Attempt], server: [BackupAttempt], deletedItems: [DeletedItem]
+    ) throws -> [Attempt] {
+        var merged = local
+        let deletedAttemptIds = Set(deletedItems.filter { $0.type == "attempt" }.map { $0.id })
+        let localAttemptIds = Set(local.map { $0.id.uuidString })
+        
+        // Get active session IDs to protect their attempts
+        let activeSessionIds = Set(
+            local.compactMap { attempt in
+                return attempt.sessionId
+            }.filter { sessionId in
+                // Check if this session ID belongs to an active session
+                // For now, we'll be conservative and not delete attempts during merge
+                return true
+            })
+        
+        // Remove items that were deleted on other devices (but be conservative with attempts)
+        merged.removeAll { attempt in
+            deletedAttemptIds.contains(attempt.id.uuidString)
+                && !activeSessionIds.contains(attempt.sessionId)
+        }
+        
+        for serverAttempt in server {
+            let localHasAttempt = localAttemptIds.contains(serverAttempt.id)
+            let isDeleted = deletedAttemptIds.contains(serverAttempt.id)
+            
+            if !localHasAttempt && !isDeleted {
+                if let serverAttemptConverted = try? serverAttempt.toAttempt() {
+                    merged.append(serverAttemptConverted)
+                }
+            }
+        }
+        
+        return merged
+    }
+}

ios/Ascently/Services/Sync/SyncProvider.swift

@@ -0,0 +1,73 @@
+import Foundation
+
+enum SyncProviderType: String, CaseIterable, Identifiable {
+    case none
+    case server
+    case iCloud
+    
+    var id: String { rawValue }
+    var displayName: String {
+        switch self {
+        case .none: return "None"
+        case .server: return "Self-Hosted Server"
+        case .iCloud: return "iCloud"
+        }
+    }
+}
+
+protocol SyncProvider {
+    var type: SyncProviderType { get }
+    var isConfigured: Bool { get }
+    var isConnected: Bool { get }
+    
+    func sync(dataManager: ClimbingDataManager) async throws
+    func testConnection() async throws
+    func disconnect()
+}
+
+enum SyncError: LocalizedError {
+    case notConfigured
+    case notConnected
+    case invalidURL
+    case invalidResponse
+    case unauthorized
+    case badRequest
+    case serverError(Int)
+    case decodingError(Error)
+    case exportFailed
+    case importFailed(Error)
+    case imageNotFound
+    case imageUploadFailed
+    case providerError(String)
+
+    var errorDescription: String? {
+        switch self {
+        case .notConfigured:
+            return "Sync server not configured. Please set server URL and auth token."
+        case .notConnected:
+            return "Not connected to sync server. Please test connection first."
+        case .invalidURL:
+            return "Invalid server URL."
+        case .invalidResponse:
+            return "Invalid response from server."
+        case .unauthorized:
+            return "Authentication failed. Check your auth token."
+        case .badRequest:
+            return "Bad request. Check your data format."
+        case .serverError(let code):
+            return "Server error (code \(code))."
+        case .decodingError(let error):
+            return "Failed to decode response: \(error.localizedDescription)"
+        case .exportFailed:
+            return "Failed to export local data."
+        case .importFailed(let error):
+            return "Failed to import data: \(error.localizedDescription)"
+        case .imageNotFound:
+            return "Image not found on server."
+        case .imageUploadFailed:
+            return "Failed to upload image to server."
+        case .providerError(let message):
+            return "Sync provider error: \(message)"
+        }
+    }
+}

ios/Ascently/Utils/AppLogger.swift

@@ -0,0 +1,46 @@
+import Foundation
+
+/// Centralized logging utility for the iOS app.
+///
+/// All log output is automatically compiled out in non-debug builds to avoid leaking
+/// sensitive information. Use this instead of calling `print` directly.
+enum AppLogger {
+
+    enum LogLevel: String {
+        case debug = "DEBUG"
+        case info = "INFO"
+        case warning = "WARN"
+        case error = "ERROR"
+    }
+
+    static func debug(_ message: @autoclosure () -> String, tag: String = #fileID) {
+        log(level: .debug, tag: tag, message: message())
+    }
+
+    static func info(_ message: @autoclosure () -> String, tag: String = #fileID) {
+        log(level: .info, tag: tag, message: message())
+    }
+
+    static func warning(_ message: @autoclosure () -> String, tag: String = #fileID) {
+        log(level: .warning, tag: tag, message: message())
+    }
+
+    static func error(_ message: @autoclosure () -> String, tag: String = #fileID) {
+        log(level: .error, tag: tag, message: message())
+    }
+
+    static func log(level: LogLevel, tag: String, message: @autoclosure () -> String) {
+        #if DEBUG
+            let lastPath = (tag as NSString).lastPathComponent
+            let resolvedTag = lastPath.isEmpty ? tag : lastPath
+            Swift.print("[\(level.rawValue)][\(resolvedTag)] \(message())")
+        #endif
+    }
+}
+
+enum LogTag {
+    static let climbingData = "ClimbingData"
+    static let dataManagement = "DataManagementSection"
+    static let exportData = "ExportDataView"
+    static let syncSection = "SyncSection"
+}

ios/Ascently/Utils/DataStateManager.swift

@@ -18,14 +18,17 @@ class DataStateManager {
     private init() {
         // Initialize with current timestamp if this is the first time
         if !isInitialized() {
-            print("DataStateManager: First time initialization")
+            AppLogger.info("DataStateManager: First time initialization", tag: "DataState")
             // Set initial timestamp to a very old date so server data will be considered newer
             let epochTime = "1970-01-01T00:00:00.000Z"
             userDefaults.set(epochTime, forKey: Keys.lastModified)
             markAsInitialized()
-            print("DataStateManager initialized with epoch timestamp: \(epochTime)")
+            AppLogger.info(
+                "DataStateManager initialized with epoch timestamp: \(epochTime)", tag: "DataState")
         } else {
-            print("DataStateManager: Already initialized, current timestamp: \(getLastModified())")
+            AppLogger.info(
+                "DataStateManager: Already initialized, current timestamp: \(getLastModified())",
+                tag: "DataState")
         }
     }
 
@@ -34,29 +37,32 @@ class DataStateManager {
     func updateDataState() {
         let now = ISO8601DateFormatter().string(from: Date())
         userDefaults.set(now, forKey: Keys.lastModified)
-        print("iOS Data state updated to: \(now)")
+        AppLogger.info("iOS Data state updated to: \(now)", tag: "DataState")
     }
 
     func getLastModified() -> String {
         if let storedTimestamp = userDefaults.string(forKey: Keys.lastModified) {
-            print("iOS DataStateManager returning stored timestamp: \(storedTimestamp)")
+            AppLogger.debug(
+                "iOS DataStateManager returning stored timestamp: \(storedTimestamp)",
+                tag: "DataState")
             return storedTimestamp
         }
 
         let epochTime = "1970-01-01T00:00:00.000Z"
-        print("No data state timestamp found - returning epoch time: \(epochTime)")
+        AppLogger.warning(
+            "No data state timestamp found - returning epoch time: \(epochTime)", tag: "DataState")
         return epochTime
     }
 
     func setLastModified(_ timestamp: String) {
         userDefaults.set(timestamp, forKey: Keys.lastModified)
-        print("Data state set to: \(timestamp)")
+        AppLogger.info("Data state set to: \(timestamp)", tag: "DataState")
     }
 
     func reset() {
         userDefaults.removeObject(forKey: Keys.lastModified)
         userDefaults.removeObject(forKey: Keys.initialized)
-        print("Data state reset")
+        AppLogger.info("Data state reset", tag: "DataState")
     }
 
     private func isInitialized() -> Bool {

ios/Ascently/Utils/ImageManager.swift

@@ -5,6 +5,7 @@ import UIKit
 
 class ImageManager {
     static let shared = ImageManager()
+    private let logTag = "ImageManager"
 
     private let thumbnailCache = NSCache<NSString, UIImage>()
     private let fileManager = FileManager.default
@@ -30,7 +31,7 @@ class ImageManager {
 
         // Final integrity check
         if !validateStorageIntegrity() {
-            print("CRITICAL: Storage integrity compromised - attempting emergency recovery")
+            logError("CRITICAL: Storage integrity compromised - attempting emergency recovery")
             emergencyImageRestore()
         }
 
@@ -83,7 +84,7 @@ class ImageManager {
             return
         }
 
-        print("🔄 Migrating images from OpenClimb to Ascently directory...")
+        logInfo("🔄 Migrating images from OpenClimb to Ascently directory...")
 
         do {
             // Create parent directory if needed
@@ -94,16 +95,16 @@ class ImageManager {
 
             // Move the entire directory
             try fileManager.moveItem(at: legacyDir, to: appSupportDirectory)
-            print("Successfully migrated image directory from OpenClimb to Ascently")
+            logInfo("Successfully migrated image directory from OpenClimb to Ascently")
         } catch {
-            print("❌ Failed to migrate image directory: \(error)")
+            logError("Failed to migrate image directory: \(error)")
             // If move fails, try to copy instead
             do {
                 try fileManager.copyItem(at: legacyDir, to: appSupportDirectory)
-                print("Successfully copied image directory from OpenClimb to Ascently")
+                logInfo("Successfully copied image directory from OpenClimb to Ascently")
                 // Don't remove the old directory in case of issues
             } catch {
-                print("❌ Failed to copy image directory: \(error)")
+                logError("Failed to copy image directory: \(error)")
             }
         }
     }
@@ -122,9 +123,9 @@ class ImageManager {
                         attributes: [
                             .protectionKey: FileProtectionType.completeUntilFirstUserAuthentication
                         ])
-                    print("Created directory: \(directory.path)")
+                    logInfo("Created directory: \(directory.path)")
                 } catch {
-                    print("ERROR: Failed to create directory \(directory.path): \(error)")
+                    logError("ERROR: Failed to create directory \(directory.path): \(error)")
                 }
             }
         }
@@ -141,9 +142,9 @@ class ImageManager {
             var backupURL = backupDirectory
             try imagesURL.setResourceValues(resourceValues)
             try backupURL.setResourceValues(resourceValues)
-            print("Excluded image directories from iCloud backup")
+            logInfo("Excluded image directories from iCloud backup")
         } catch {
-            print("WARNING: Failed to exclude from iCloud backup: \(error)")
+            logWarning("WARNING: Failed to exclude from iCloud backup: \(error)")
         }
     }
 
@@ -167,11 +168,11 @@ class ImageManager {
     }
 
     private func performRobustMigration() {
-        print("Starting robust image migration system...")
+        logInfo("Starting robust image migration system...")
 
         // Check for interrupted migration
         if let incompleteState = loadMigrationState() {
-            print("Detected interrupted migration, resuming...")
+            logInfo("Detected interrupted migration, resuming...")
             resumeMigration(from: incompleteState)
         } else {
             // Start fresh migration
@@ -188,7 +189,7 @@ class ImageManager {
     private func startNewMigration() {
         // First check for images in previous Application Support directories
         if let previousAppSupportImages = findPreviousAppSupportImages() {
-            print("Found images in previous Application Support directory")
+            logInfo("Found images in previous Application Support directory")
             migratePreviousAppSupportImages(from: previousAppSupportImages)
             return
         }
@@ -198,7 +199,7 @@ class ImageManager {
         let hasLegacyImportImages = fileManager.fileExists(atPath: legacyImportImagesDirectory.path)
 
         guard hasLegacyImages || hasLegacyImportImages else {
-            print("No legacy images to migrate")
+            logInfo("No legacy images to migrate")
             return
         }
 
@@ -213,7 +214,7 @@ class ImageManager {
                 let legacyFiles = try fileManager.contentsOfDirectory(
                     atPath: legacyImagesDirectory.path)
                 allLegacyFiles.append(contentsOf: legacyFiles)
-                print("Found \(legacyFiles.count) images in OpenClimbImages")
+                logInfo("Found \(legacyFiles.count) images in OpenClimbImages")
             }
 
             // Collect files from Documents/images directory
@@ -221,10 +222,10 @@ class ImageManager {
                 let importFiles = try fileManager.contentsOfDirectory(
                     atPath: legacyImportImagesDirectory.path)
                 allLegacyFiles.append(contentsOf: importFiles)
-                print("Found \(importFiles.count) images in Documents/images")
+                logInfo("Found \(importFiles.count) images in Documents/images")
             }
 
-            print("Total legacy images to migrate: \(allLegacyFiles.count)")
+            logInfo("Total legacy images to migrate: \(allLegacyFiles.count)")
 
             let initialState = MigrationState(
                 version: MigrationState.currentVersion,
@@ -239,24 +240,24 @@ class ImageManager {
             performMigrationWithCheckpoints(files: allLegacyFiles, currentState: initialState)
 
         } catch {
-            print("ERROR: Failed to start migration: \(error)")
+            logError("ERROR: Failed to start migration: \(error)")
         }
     }
 
     private func resumeMigration(from state: MigrationState) {
-        print("Resuming migration from checkpoint...")
+        logInfo("Resuming migration from checkpoint...")
-        print("Progress: \(state.completedFiles.count)/\(state.totalFiles)")
+        logInfo("Progress: \(state.completedFiles.count)/\(state.totalFiles)")
 
         do {
             let legacyFiles = try fileManager.contentsOfDirectory(
                 atPath: legacyImagesDirectory.path)
             let remainingFiles = legacyFiles.filter { !state.completedFiles.contains($0) }
 
-            print("Resuming with \(remainingFiles.count) remaining files")
+            logInfo("Resuming with \(remainingFiles.count) remaining files")
             performMigrationWithCheckpoints(files: remainingFiles, currentState: state)
 
         } catch {
-            print("ERROR: Failed to resume migration: \(error)")
+            logError("ERROR: Failed to resume migration: \(error)")
             // Fallback: start fresh
             removeMigrationState()
             startNewMigration()
@@ -323,11 +324,11 @@ class ImageManager {
                     completedFiles.append(fileName)
                     migratedCount += 1
 
-                    print("Migrated: \(fileName) (\(migratedCount)/\(currentState.totalFiles))")
+                    logInfo("Migrated: \(fileName) (\(migratedCount)/\(currentState.totalFiles))")
 
                 } catch {
                     failedCount += 1
-                    print("ERROR: Failed to migrate \(fileName): \(error)")
+                    logError("ERROR: Failed to migrate \(fileName): \(error)")
                 }
 
                 // Save checkpoint every 5 files or if interrupted
@@ -341,7 +342,7 @@ class ImageManager {
                         lastCheckpoint: Date()
                     )
                     saveMigrationState(checkpointState)
-                    print("Checkpoint saved: \(completedFiles.count)/\(currentState.totalFiles)")
+                    logInfo("Checkpoint saved: \(completedFiles.count)/\(currentState.totalFiles)")
                 }
             }
         }
@@ -357,7 +358,7 @@ class ImageManager {
         )
         saveMigrationState(finalState)
 
-        print("Migration complete: \(migratedCount) migrated, \(failedCount) failed")
+        logInfo("Migration complete: \(migratedCount) migrated, \(failedCount) failed")
 
         // Clean up legacy directory if no failures
         if failedCount == 0 {
@@ -366,7 +367,7 @@ class ImageManager {
     }
 
     private func verifyMigrationIntegrity() {
-        print("Verifying migration integrity...")
+        logInfo("Verifying migration integrity...")
 
         var allLegacyFiles = Set<String>()
 
@@ -384,12 +385,12 @@ class ImageManager {
                 allLegacyFiles.formUnion(importFiles)
             }
         } catch {
-            print("ERROR: Failed to read legacy directories: \(error)")
+            logError("ERROR: Failed to read legacy directories: \(error)")
             return
         }
 
         guard !allLegacyFiles.isEmpty else {
-            print("No legacy directories to verify against")
+            logInfo("No legacy directories to verify against")
             return
         }
 
@@ -400,10 +401,10 @@ class ImageManager {
             let missingFiles = allLegacyFiles.subtracting(migratedFiles)
 
             if missingFiles.isEmpty {
-                print("Migration integrity verified - all files present")
+                logInfo("Migration integrity verified - all files present")
                 cleanupLegacyDirectory()
             } else {
-                print("WARNING: Missing \(missingFiles.count) files, re-triggering migration")
+                logWarning("WARNING: Missing \(missingFiles.count) files, re-triggering migration")
                 // Re-trigger migration for missing files
                 performMigrationWithCheckpoints(
                     files: Array(missingFiles),
@@ -417,16 +418,16 @@ class ImageManager {
                     ))
             }
         } catch {
-            print("ERROR: Failed to verify migration integrity: \(error)")
+            logError("ERROR: Failed to verify migration integrity: \(error)")
         }
     }
 
     private func cleanupLegacyDirectory() {
         do {
             try fileManager.removeItem(at: legacyImagesDirectory)
-            print("Cleaned up legacy directory")
+            logInfo("Cleaned up legacy directory")
         } catch {
-            print("WARNING: Failed to clean up legacy directory: \(error)")
+            logWarning("WARNING: Failed to clean up legacy directory: \(error)")
         }
     }
 
@@ -446,16 +447,16 @@ class ImageManager {
             let data = try Data(contentsOf: migrationStateURL)
             let state = try JSONDecoder().decode(MigrationState.self, from: data)
 
-            // Check if state is too old (more than 1 hour)
+            // Check if state is too old
             if Date().timeIntervalSince(state.lastCheckpoint) > 3600 {
-                print("WARNING: Migration state is stale, starting fresh")
+                logWarning("WARNING: Migration state is stale, starting fresh")
                 removeMigrationState()
                 return nil
             }
 
             return state.isComplete ? nil : state
         } catch {
-            print("ERROR: Failed to load migration state: \(error)")
+            logError("ERROR: Failed to load migration state: \(error)")
             removeMigrationState()
             return nil
         }
@@ -466,7 +467,7 @@ class ImageManager {
             let data = try JSONEncoder().encode(state)
             try data.write(to: migrationStateURL)
         } catch {
-            print("ERROR: Failed to save migration state: \(error)")
+            logError("ERROR: Failed to save migration state: \(error)")
         }
     }
 
@@ -482,7 +483,7 @@ class ImageManager {
     private func cleanupMigrationState() {
         try? fileManager.removeItem(at: migrationStateURL)
         try? fileManager.removeItem(at: migrationLockURL)
-        print("Cleaned up migration state files")
+        logInfo("Cleaned up migration state files")
     }
 
     func saveImageData(_ data: Data, withName name: String? = nil) -> String? {
@@ -497,10 +498,10 @@ class ImageManager {
             // Create backup copy
             try data.write(to: backupPath)
 
-            print("Saved image with backup: \(fileName)")
+            logInfo("Saved image with backup: \(fileName)")
             return fileName
         } catch {
-            print("ERROR: Failed to save image \(fileName): \(error)")
+            logError("ERROR: Failed to save image \(fileName): \(error)")
             return nil
         }
     }
@@ -520,7 +521,7 @@ class ImageManager {
         if fileManager.fileExists(atPath: backupPath.path),
             let data = try? Data(contentsOf: backupPath)
         {
-            print("Restored image from backup: \(path)")
+            logInfo("Restored image from backup: \(path)")
 
             // Restore to primary location
             try? data.write(to: URL(fileURLWithPath: primaryPath))
@@ -595,7 +596,7 @@ class ImageManager {
             do {
                 try fileManager.removeItem(atPath: primaryPath)
             } catch {
-                print("ERROR: Failed to delete primary image at \(primaryPath): \(error)")
+                logError("ERROR: Failed to delete primary image at \(primaryPath): \(error)")
                 success = false
             }
         }
@@ -605,7 +606,7 @@ class ImageManager {
             do {
                 try fileManager.removeItem(at: backupPath)
             } catch {
-                print("ERROR: Failed to delete backup image at \(backupPath.path): \(error)")
+                logError("ERROR: Failed to delete backup image at \(backupPath.path): \(error)")
                 success = false
             }
         }
@@ -642,7 +643,7 @@ class ImageManager {
     }
 
     func performMaintenance() {
-        print("Starting image maintenance...")
+        logInfo("Starting image maintenance...")
 
         syncBackups()
         validateImageIntegrity()
@@ -660,11 +661,11 @@ class ImageManager {
                     let backupPath = backupDirectory.appendingPathComponent(fileName)
 
                     try? fileManager.copyItem(at: primaryPath, to: backupPath)
-                    print("Created missing backup for: \(fileName)")
+                    logInfo("Created missing backup for: \(fileName)")
                 }
             }
         } catch {
-            print("ERROR: Failed to sync backups: \(error)")
+            logError("ERROR: Failed to sync backups: \(error)")
         }
     }
 
@@ -683,14 +684,14 @@ class ImageManager {
                 }
             }
 
-            print("Validated \(validFiles) of \(files.count) image files")
+            logInfo("Validated \(validFiles) of \(files.count) image files")
         } catch {
-            print("ERROR: Failed to validate images: \(error)")
+            logError("ERROR: Failed to validate images: \(error)")
         }
     }
 
     private func cleanupOrphanedFiles() {
-        print("Cleanup would require coordination with data manager")
+        logInfo("Cleanup would require coordination with data manager")
     }
 
     func getStorageInfo() -> (primaryCount: Int, backupCount: Int, totalSize: Int64) {
@@ -718,7 +719,7 @@ class ImageManager {
     private func logDirectoryInfo() {
         let info = getStorageInfo()
         let previousDir = findPreviousAppSupportImages()
-        print(
+        logInfo(
             """
             Ascently Image Storage:
             - App Support: \(appSupportDirectory.path)
@@ -732,7 +733,7 @@ class ImageManager {
     }
 
     func forceRecoveryMigration() {
-        print("FORCE RECOVERY: Starting manual migration recovery...")
+        logInfo("FORCE RECOVERY: Starting manual migration recovery...")
 
         // Remove any stale state
         removeMigrationState()
@@ -741,7 +742,7 @@ class ImageManager {
         // Force fresh migration
         startNewMigration()
 
-        print("FORCE RECOVERY: Migration recovery completed")
+        logInfo("FORCE RECOVERY: Migration recovery completed")
     }
 
     func saveImportedImage(_ imageData: Data, filename: String) throws -> String {
@@ -754,12 +755,12 @@ class ImageManager {
         // Create backup
         try? imageData.write(to: backupPath)
 
-        print("Imported image: \(filename)")
+        logInfo("Imported image: \(filename)")
         return filename
     }
 
     func emergencyImageRestore() {
-        print("EMERGENCY: Attempting image restoration...")
+        logError("EMERGENCY: Attempting image restoration...")
 
         // Try to restore from backup directory
         do {
@@ -777,14 +778,14 @@ class ImageManager {
                 }
             }
 
-            print("EMERGENCY: Restored \(restoredCount) images from backup")
+            logError("EMERGENCY: Restored \(restoredCount) images from backup")
         } catch {
-            print("EMERGENCY: Failed to restore from backup: \(error)")
+            logError("EMERGENCY: Failed to restore from backup: \(error)")
         }
 
         // Try previous Application Support directories first
         if let previousAppSupportImages = findPreviousAppSupportImages() {
-            print("EMERGENCY: Found previous Application Support images, migrating...")
+            logError("EMERGENCY: Found previous Application Support images, migrating...")
             migratePreviousAppSupportImages(from: previousAppSupportImages)
             return
         }
@@ -793,23 +794,21 @@ class ImageManager {
         if fileManager.fileExists(atPath: legacyImagesDirectory.path)
             || fileManager.fileExists(atPath: legacyImportImagesDirectory.path)
         {
-            print("EMERGENCY: Attempting legacy migration as fallback...")
+            logError("EMERGENCY: Attempting legacy migration as fallback...")
             forceRecoveryMigration()
         }
     }
 
     func debugSafeInitialization() -> Bool {
-        print("DEBUG SAFE: Performing debug-safe initialization check...")
+        logDebug("DEBUG SAFE: Performing debug-safe initialization check...")
 
         // Check if we're in a debug environment
         #if DEBUG
-            print("DEBUG SAFE: Debug environment detected")
+            logDebug("DEBUG SAFE: Debug environment detected")
 
-            // Check for interrupted migration more aggressively
             if fileManager.fileExists(atPath: migrationLockURL.path) {
-                print("DEBUG SAFE: Found migration lock - likely debug interruption")
+                logDebug("DEBUG SAFE: Found migration lock - likely debug interruption")
 
-                // Give extra time for file system to stabilize
                 Thread.sleep(forTimeInterval: 1.0)
 
                 // Try emergency recovery
@@ -829,14 +828,14 @@ class ImageManager {
             ((try? fileManager.contentsOfDirectory(atPath: backupDirectory.path)) ?? []).count > 0
 
         if primaryEmpty && backupHasFiles {
-            print("DEBUG SAFE: Primary empty but backup exists - restoring")
+            logDebug("DEBUG SAFE: Primary empty but backup exists - restoring")
             emergencyImageRestore()
             return true
         }
 
         // Check if primary storage is empty but previous Application Support images exist
         if primaryEmpty, let previousAppSupportImages = findPreviousAppSupportImages() {
-            print("DEBUG SAFE: Primary empty but found previous Application Support images")
+            logDebug("DEBUG SAFE: Primary empty but found previous Application Support images")
             migratePreviousAppSupportImages(from: previousAppSupportImages)
             return true
         }
@@ -852,7 +851,7 @@ class ImageManager {
 
         // Check if we have more backups than primary files (sign of corruption)
         if backupFiles.count > primaryFiles.count + 5 {
-            print(
+            logInfo(
                 "WARNING INTEGRITY: Backup count significantly exceeds primary - potential corruption"
             )
             return false
@@ -860,7 +859,7 @@ class ImageManager {
 
         // Check if primary is completely empty but we have data elsewhere
         if primaryFiles.isEmpty && !backupFiles.isEmpty {
-            print("WARNING INTEGRITY: Primary storage empty but backups exist")
+            logWarning("WARNING INTEGRITY: Primary storage empty but backups exist")
             return false
         }
 
@@ -874,7 +873,7 @@ class ImageManager {
                 for: .applicationSupportDirectory, in: .userDomainMask
             ).first
         else {
-            print("ERROR: Could not access Application Support directory")
+            logError("ERROR: Could not access Application Support directory")
             return nil
         }
 
@@ -908,13 +907,13 @@ class ImageManager {
                 }
             }
         } catch {
-            print("ERROR: Error scanning for previous Application Support directories: \(error)")
+            logError("ERROR: Error scanning for previous Application Support directories: \(error)")
         }
         return nil
     }
 
     private func migratePreviousAppSupportImages(from sourceDirectory: URL) {
-        print("Migrating images from previous Application Support directory")
+        logInfo("Migrating images from previous Application Support directory")
 
         do {
             let imageFiles = try fileManager.contentsOfDirectory(atPath: sourceDirectory.path)
@@ -937,18 +936,33 @@ class ImageManager {
                         // Create backup
                         try? fileManager.copyItem(at: sourcePath, to: backupPath)
 
-                        print("Migrated: \(fileName)")
+                        logInfo("Migrated: \(fileName)")
                     } catch {
-                        print("ERROR: Failed to migrate \(fileName): \(error)")
+                        logError("ERROR: Failed to migrate \(fileName): \(error)")
                     }
                 }
             }
 
-            print("Completed migration from previous Application Support directory")
+            logInfo("Completed migration from previous Application Support directory")
 
         } catch {
-            print("ERROR: Failed to migrate from previous Application Support: \(error)")
+            logError("ERROR: Failed to migrate from previous Application Support: \(error)")
         }
     }
 
+    private func logInfo(_ message: String) {
+        AppLogger.info(message, tag: logTag)
+    }
+
+    private func logWarning(_ message: String) {
+        AppLogger.warning(message, tag: logTag)
+    }
+
+    private func logError(_ message: String) {
+        AppLogger.error(message, tag: logTag)
+    }
+
+    private func logDebug(_ message: String) {
+        AppLogger.debug(message, tag: logTag)
+    }
 }

ios/Ascently/Utils/ThemeManager.swift

@@ -0,0 +1,77 @@
+import SwiftUI
+import Combine
+
+class ThemeManager: ObservableObject {
+    @Published var accentColor: Color = .blue {
+        didSet {
+            saveColor()
+        }
+    }
+    
+    private let userDefaultsKey = "accentColorData"
+    
+    init() {
+        loadColor()
+    }
+    
+    private func loadColor() {
+        guard let data = UserDefaults.standard.data(forKey: userDefaultsKey) else {
+            self.accentColor = .blue
+            return
+        }
+        
+        do {
+            if let uiColor = try NSKeyedUnarchiver.unarchivedObject(ofClass: UIColor.self, from: data) {
+                self.accentColor = Color(uiColor)
+            }
+        } catch {
+            print("Failed to load accent color: \(error)")
+            self.accentColor = .blue
+        }
+    }
+    
+    private func saveColor() {
+        do {
+            let uiColor = UIColor(accentColor)
+            let data = try NSKeyedArchiver.archivedData(withRootObject: uiColor, requiringSecureCoding: false)
+            UserDefaults.standard.set(data, forKey: userDefaultsKey)
+        } catch {
+            print("Failed to save accent color: \(error)")
+        }
+    }
+    
+    func resetToDefault() {
+        accentColor = .blue
+    }
+    
+    // Curated list of preset colors that maintain good contrast
+    static let presetColors: [Color] = [
+        .blue,      // Default Blue
+        .purple,    // Purple
+        .pink,      // Pink
+        .red,       // Red
+        .orange,    // Orange
+        .green,     // Green
+        .teal,      // Teal
+        .indigo,    // Indigo
+        .mint,      // Mint
+        Color(uiColor: .systemBrown), // Brown
+        Color(uiColor: .systemCyan)   // Cyan
+    ]
+    
+    var contrastingTextColor: Color {
+        let uiColor = UIColor(accentColor)
+        var red: CGFloat = 0
+        var green: CGFloat = 0
+        var blue: CGFloat = 0
+        var alpha: CGFloat = 0
+        
+        uiColor.getRed(&red, green: &green, blue: &blue, alpha: &alpha)
+        
+        // Calculate relative luminance
+        let luminance = 0.299 * red + 0.587 * green + 0.114 * blue
+        
+        // Return black for light colors, white for dark colors
+        return luminance > 0.5 ? .black : .white
+    }
+}

ios/Ascently/Utils/ZipUtils.swift

@@ -4,6 +4,8 @@ import zlib
 
 struct ZipUtils {
 
+    private static let logTag = "ZipUtils"
+
     private static let DATA_JSON_FILENAME = "data.json"
     private static let IMAGES_DIR_NAME = "images"
     private static let METADATA_FILENAME = "metadata.txt"
@@ -49,7 +51,7 @@ struct ZipUtils {
         )
 
         // Process images in batches for better performance
-        print("Processing \(referencedImagePaths.count) images for export")
+        logInfo("Processing \(referencedImagePaths.count) images for export")
         var successfulImages = 0
         let batchSize = 10
         let sortedPaths = Array(referencedImagePaths).sorted()
@@ -59,7 +61,7 @@ struct ZipUtils {
 
         for (index, imagePath) in sortedPaths.enumerated() {
             if index % batchSize == 0 {
-                print("Processing images \(index)/\(sortedPaths.count)")
+                logInfo("Processing images \(index)/\(sortedPaths.count)")
             }
 
             let imageURL = URL(fileURLWithPath: imagePath)
@@ -83,11 +85,11 @@ struct ZipUtils {
                     successfulImages += 1
                 }
             } catch {
-                print("Failed to read image: \(imageName)")
+                logWarning("Failed to read image: \(imageName)")
             }
         }
 
-        print("Export: included \(successfulImages)/\(referencedImagePaths.count) images")
+        logInfo("Export: included \(successfulImages)/\(referencedImagePaths.count) images")
 
         // Build central directory
         centralDirectory.reserveCapacity(fileEntries.count * 100)  // Estimate 100 bytes per entry
@@ -114,7 +116,7 @@ struct ZipUtils {
     }
 
     static func extractImportZip(data: Data) throws -> ImportResult {
-        print("Starting ZIP extraction - data size: \(data.count) bytes")
+        logInfo("Starting ZIP extraction - data size: \(data.count) bytes")
 
         return try extractUsingCustomParser(data: data)
     }
@@ -127,10 +129,10 @@ struct ZipUtils {
         let zipEntries: [ZipEntry]
         do {
             zipEntries = try parseZipFile(data: data)
-            print("Successfully parsed ZIP file with \(zipEntries.count) entries")
+            logInfo("Successfully parsed ZIP file with \(zipEntries.count) entries")
         } catch {
-            print("Failed to parse ZIP file: \(error)")
+            logError("Failed to parse ZIP file: \(error)")
-            print(
+            logError(
                 "ZIP data header: \(data.prefix(20).map { String(format: "%02X", $0) }.joined(separator: " "))"
             )
             throw NSError(
@@ -142,24 +144,24 @@ struct ZipUtils {
             )
         }
 
-        print("Found \(zipEntries.count) entries in ZIP file:")
+        logInfo("Found \(zipEntries.count) entries in ZIP file:")
         for entry in zipEntries {
-            print("  - \(entry.filename) (size: \(entry.data.count) bytes)")
+            logInfo("  - \(entry.filename) (size: \(entry.data.count) bytes)")
         }
 
         for entry in zipEntries {
             switch entry.filename {
             case METADATA_FILENAME:
                 metadataContent = String(data: entry.data, encoding: .utf8) ?? ""
-                print("Found metadata: \(metadataContent.prefix(100))...")
+                logInfo("Found metadata: \(metadataContent.prefix(100))...")
 
             case DATA_JSON_FILENAME:
                 jsonContent = String(data: entry.data, encoding: .utf8) ?? ""
-                print("Found data.json with \(jsonContent.count) characters")
+                logInfo("Found data.json with \(jsonContent.count) characters")
                 if jsonContent.isEmpty {
-                    print("WARNING: data.json is empty!")
+                    logWarning("WARNING: data.json is empty!")
                 } else {
-                    print("data.json preview: \(jsonContent.prefix(200))...")
+                    logInfo("data.json preview: \(jsonContent.prefix(200))...")
                 }
 
             default:
@@ -173,17 +175,17 @@ struct ZipUtils {
                             entry.data, filename: originalFilename)
                         importedImagePaths[originalFilename] = filename
                     } catch {
-                        print("Failed to import image \(originalFilename): \(error)")
+                        logError("Failed to import image \(originalFilename): \(error)")
                     }
                 }
             }
         }
 
         guard !jsonContent.isEmpty else {
-            print("ERROR: data.json not found or empty")
+            logError("ERROR: data.json not found or empty")
-            print("Available files in ZIP:")
+            logInfo("Available files in ZIP:")
             for entry in zipEntries {
-                print("  - \(entry.filename)")
+                logInfo("  - \(entry.filename)")
             }
             throw NSError(
                 domain: "ImportError", code: 1,
@@ -194,13 +196,25 @@ struct ZipUtils {
             )
         }
 
-        print("Import extraction completed: \(importedImagePaths.count) images processed")
+        logInfo("Import extraction completed: \(importedImagePaths.count) images processed")
 
         return ImportResult(
             jsonData: jsonContent.data(using: .utf8) ?? Data(), imagePathMapping: importedImagePaths
         )
     }
 
+    private static func logInfo(_ message: String) {
+        AppLogger.info(message, tag: logTag)
+    }
+
+    private static func logWarning(_ message: String) {
+        AppLogger.warning(message, tag: logTag)
+    }
+
+    private static func logError(_ message: String) {
+        AppLogger.error(message, tag: logTag)
+    }
+
     private static func createMetadata(
         exportData: ClimbDataBackup,
         referencedImagePaths: Set<String>

ios/Ascently/ViewModels/ClimbingDataManager.swift

@@ -15,6 +15,8 @@ import UniformTypeIdentifiers
 @MainActor
 class ClimbingDataManager: ObservableObject {
 
+    static let shared = ClimbingDataManager()
+
     @Published var gyms: [Gym] = []
     @Published var problems: [Problem] = []
     @Published var sessions: [ClimbSession] = []
@@ -38,7 +40,6 @@ class ClimbingDataManager: ObservableObject {
     let healthKitService = HealthKitService.shared
 
     @Published var isSyncing = false
-
     private enum Keys {
         static let gyms = "ascently_gyms"
         static let problems = "ascently_problems"
@@ -79,7 +80,7 @@ class ClimbingDataManager: ObservableObject {
         let name: String
     }
 
-    init() {
+    fileprivate init() {
         _ = ImageManager.shared
         migrateFromOpenClimbIfNeeded()
         loadAllData()
@@ -115,7 +116,8 @@ class ClimbingDataManager: ObservableObject {
             return
         }
 
-        print("Starting migration from OpenClimb to Ascently keys...")
+        AppLogger.info(
+            "Starting migration from OpenClimb to Ascently keys...", tag: LogTag.climbingData)
         var migrationCount = 0
 
         // Migrate each data type if it exists in old format but not in new format
@@ -135,7 +137,7 @@ class ClimbingDataManager: ObservableObject {
                 userDefaults.set(oldData, forKey: newKey)
                 userDefaults.removeObject(forKey: oldKey)
                 migrationCount += 1
-                print("✅ Migrated: \(oldKey) → \(newKey)")
+                AppLogger.info("Migrated: \(oldKey) → \(newKey)", tag: LogTag.climbingData)
             }
         }
 
@@ -147,7 +149,8 @@ class ClimbingDataManager: ObservableObject {
                 {
                     sharedDefaults.set(oldData, forKey: newKey)
                     sharedDefaults.removeObject(forKey: oldKey)
-                    print("✅ Migrated shared: \(oldKey) → \(newKey)")
+                    AppLogger.info(
+                        "Migrated shared: \(oldKey) → \(newKey)", tag: LogTag.climbingData)
                 }
             }
         }
@@ -161,18 +164,19 @@ class ClimbingDataManager: ObservableObject {
             userDefaults.set(lastModified, forKey: newDataStateKey)
             userDefaults.removeObject(forKey: legacyDataStateKey)
             migrationCount += 1
-            print("✅ Migrated data state timestamp")
+            AppLogger.info("Migrated data state timestamp", tag: LogTag.climbingData)
         }
 
         // Mark migration as completed
         userDefaults.set(true, forKey: migrationKey)
 
         if migrationCount > 0 {
-            print(
+            AppLogger.info(
-                "Migration completed! Migrated \(migrationCount) data items from OpenClimb to Ascently"
+                "Migration completed! Migrated \(migrationCount) data items from OpenClimb to Ascently",
+                tag: LogTag.climbingData
             )
         } else {
-            print("No OpenClimb data found to migrate")
+            AppLogger.info("No OpenClimb data found to migrate", tag: LogTag.climbingData)
         }
     }
 
@@ -413,9 +417,16 @@ class ClimbingDataManager: ObservableObject {
     }
 
     func startSession(gymId: UUID, notes: String? = nil) {
-        // End any currently active session
+        Task { @MainActor in
+            await startSessionAsync(gymId: gymId, notes: notes)
+        }
+    }
+
+    @discardableResult
+    func startSessionAsync(gymId: UUID, notes: String? = nil) async -> ClimbSession? {
+        // End any currently active session before starting a new one
         if let currentActive = activeSession {
-            endSession(currentActive.id)
+            await endSessionAsync(currentActive.id)
         }
 
         let newSession = ClimbSession(gymId: gymId, notes: notes)
@@ -428,29 +439,40 @@ class ClimbingDataManager: ObservableObject {
 
         // MARK: - Start Live Activity for new session
         if let gym = gym(withId: gymId) {
-            Task {
             await LiveActivityManager.shared.startLiveActivity(
-                    for: newSession, gymName: gym.name)
+                for: newSession,
-            }
+                gymName: gym.name)
         }
 
         if healthKitService.isEnabled {
-            Task {
             do {
                 try await healthKitService.startWorkout(
                     startDate: newSession.startTime ?? Date(),
                     sessionId: newSession.id)
             } catch {
-                    print("Failed to start HealthKit workout: \(error.localizedDescription)")
+                AppLogger.error(
-                }
+                    "Failed to start HealthKit workout: \(error.localizedDescription)",
-            }
+                    tag: LogTag.climbingData)
             }
         }
 
+        return newSession
+    }
+
     func endSession(_ sessionId: UUID) {
-        if let session = sessions.first(where: { $0.id == sessionId && $0.status == .active }),
+        Task { @MainActor in
+            await endSessionAsync(sessionId)
+        }
+    }
+
+    @discardableResult
+    func endSessionAsync(_ sessionId: UUID) async -> ClimbSession? {
+        guard
+            let session = sessions.first(where: { $0.id == sessionId && $0.status == .active }),
             let index = sessions.firstIndex(where: { $0.id == sessionId })
-        {
+        else {
+            return nil
+        }
 
         let completedSession = session.completed()
         sessions[index] = completedSession
@@ -467,21 +489,20 @@ class ClimbingDataManager: ObservableObject {
         syncService.triggerAutoSync(dataManager: self)
 
         // MARK: - End Live Activity after session ends
-            Task {
         await LiveActivityManager.shared.endLiveActivity()
-            }
 
         if healthKitService.isEnabled {
-                Task {
             do {
                 try await healthKitService.endWorkout(
                     endDate: completedSession.endTime ?? Date())
             } catch {
-                        print("Failed to end HealthKit workout: \(error.localizedDescription)")
+                AppLogger.error(
-                    }
+                    "Failed to end HealthKit workout: \(error.localizedDescription)",
-                }
+                    tag: LogTag.climbingData)
             }
         }
+
+        return completedSession
     }
 
     func updateSession(_ session: ClimbSession) {
@@ -667,7 +688,9 @@ class ClimbingDataManager: ObservableObject {
         }
 
         if !orphanedAttempts.isEmpty {
-            print("🧹 Cleaning up \(orphanedAttempts.count) orphaned attempts")
+            AppLogger.info(
+                "🧹 Cleaning up \(orphanedAttempts.count) orphaned attempts",
+                tag: LogTag.climbingData)
 
             // Track these as deleted to prevent sync from re-introducing them
             for attempt in orphanedAttempts {
@@ -693,14 +716,15 @@ class ClimbingDataManager: ObservableObject {
 
             if seenAttempts.contains(key) {
                 duplicateIds.append(attempt.id)
-                print("🧹 Found duplicate attempt: \(attempt.id)")
+                AppLogger.info("🧹 Found duplicate attempt: \(attempt.id)", tag: LogTag.climbingData)
             } else {
                 seenAttempts.insert(key)
             }
         }
 
         if !duplicateIds.isEmpty {
-            print("🧹 Removing \(duplicateIds.count) duplicate attempts")
+            AppLogger.info(
+                "🧹 Removing \(duplicateIds.count) duplicate attempts", tag: LogTag.climbingData)
 
             // Track duplicates as deleted
             for attemptId in duplicateIds {
@@ -714,8 +738,9 @@ class ClimbingDataManager: ObservableObject {
         if initialAttemptCount != attempts.count {
             saveAttempts()
             let removedCount = initialAttemptCount - attempts.count
-            print(
+            AppLogger.info(
-                "Cleanup complete. Removed \(removedCount) attempts. Remaining: \(attempts.count)"
+                "Cleanup complete. Removed \(removedCount) attempts. Remaining: \(attempts.count)",
+                tag: LogTag.climbingData
             )
         }
 
@@ -725,7 +750,9 @@ class ClimbingDataManager: ObservableObject {
         }
 
         if !orphanedProblems.isEmpty {
-            print("🧹 Cleaning up \(orphanedProblems.count) orphaned problems")
+            AppLogger.info(
+                "🧹 Cleaning up \(orphanedProblems.count) orphaned problems",
+                tag: LogTag.climbingData)
 
             for problem in orphanedProblems {
                 trackDeletion(itemId: problem.id.uuidString, itemType: "problem")
@@ -744,7 +771,9 @@ class ClimbingDataManager: ObservableObject {
         }
 
         if !orphanedSessions.isEmpty {
-            print("🧹 Cleaning up \(orphanedSessions.count) orphaned sessions")
+            AppLogger.info(
+                "🧹 Cleaning up \(orphanedSessions.count) orphaned sessions",
+                tag: LogTag.climbingData)
 
             for session in orphanedSessions {
                 trackDeletion(itemId: session.id.uuidString, itemType: "session")
@@ -844,19 +873,29 @@ class ClimbingDataManager: ObservableObject {
             let problemsForImages = problems
 
             // Move heavy I/O operations to background thread
+            let logTag = LogTag.climbingData
             let zipData = try await Task.detached(priority: .userInitiated) {
                 // Collect actual image paths from disk for the ZIP
-                let referencedImagePaths = await Self.collectReferencedImagePathsStatic(
+                let imageSummary = Self.collectReferencedImagePathsStatic(
                     problems: problemsForImages,
                     imagesDirectory: imagesDirectory)
-                print("Starting export with \(referencedImagePaths.count) images")
+                let referencedImagePaths = imageSummary.paths
+
+                await MainActor.run {
+                    AppLogger.info(
+                        "Starting export with \(referencedImagePaths.count) images (\(imageSummary.missingCount) missing)",
+                        tag: logTag)
+                }
 
                 let zipData = try await ZipUtils.createExportZip(
                     exportData: exportData,
                     referencedImagePaths: referencedImagePaths
                 )
 
-                print("Export completed successfully")
+                await MainActor.run {
+                    AppLogger.info("Export completed successfully", tag: logTag)
+                }
+
                 return (zipData, referencedImagePaths.count)
             }.value
 
@@ -865,7 +904,7 @@ class ClimbingDataManager: ObservableObject {
             return zipData.0
         } catch {
             let errorMessage = "Export failed: \(error.localizedDescription)"
-            print("ERROR: \(errorMessage)")
+            AppLogger.error("ERROR: \(errorMessage)", tag: LogTag.climbingData)
             setError(errorMessage)
             return nil
         }
@@ -894,16 +933,24 @@ class ClimbingDataManager: ObservableObject {
                 return Date()
             }
 
-            print("Raw JSON content preview:")
+            AppLogger.debug("Raw JSON content preview:", tag: LogTag.climbingData)
-            print(String(decoding: importResult.jsonData.prefix(500), as: UTF8.self) + "...")
+            AppLogger.debug(
+                String(decoding: importResult.jsonData.prefix(500), as: UTF8.self) + "...",
+                tag: LogTag.climbingData
+            )
 
             let importData = try decoder.decode(ClimbDataBackup.self, from: importResult.jsonData)
 
-            print("Successfully decoded import data:")
+            AppLogger.info(
-            print("- Gyms: \(importData.gyms.count)")
+                """
-            print("- Problems: \(importData.problems.count)")
+                Successfully decoded import data:
-            print("- Sessions: \(importData.sessions.count)")
+                - Gyms: \(importData.gyms.count)
-            print("- Attempts: \(importData.attempts.count)")
+                - Problems: \(importData.problems.count)
+                - Sessions: \(importData.sessions.count)
+                - Attempts: \(importData.attempts.count)
+                """,
+                tag: LogTag.climbingData
+            )
 
             try validateImportData(importData)
 
@@ -960,14 +1007,20 @@ class ClimbingDataManager: ObservableObject {
 extension ClimbingDataManager {
     private func collectReferencedImagePaths() -> Set<String> {
         let imagesDirectory = ImageManager.shared.imagesDirectory.path
-        return Self.collectReferencedImagePathsStatic(
+        let result = Self.collectReferencedImagePathsStatic(
             problems: problems,
             imagesDirectory: imagesDirectory)
+
+        AppLogger.info(
+            "Export: Collected \(result.paths.count) images (\(result.missingCount) missing)",
+            tag: LogTag.climbingData)
+
+        return result.paths
     }
 
-    private static func collectReferencedImagePathsStatic(
+    nonisolated private static func collectReferencedImagePathsStatic(
         problems: [Problem], imagesDirectory: String
-    ) -> Set<String> {
+    ) -> (paths: Set<String>, missingCount: Int) {
         var imagePaths = Set<String>()
         var missingCount = 0
 
@@ -988,8 +1041,7 @@ extension ClimbingDataManager {
             }
         }
 
-        print("Export: Collected \(imagePaths.count) images (\(missingCount) missing)")
+        return (imagePaths, missingCount)
-        return imagePaths
     }
 
     private func updateProblemImagePaths(
@@ -1030,11 +1082,14 @@ extension ClimbingDataManager {
                             }
 
                             deterministicImagePaths.append(deterministicName)
-                            print("Renamed imported image: \(tempFileName) → \(deterministicName)")
+                            AppLogger.debug(
+                                "Renamed imported image: \(tempFileName) → \(deterministicName)",
+                                tag: LogTag.climbingData)
                         }
                     } catch {
-                        print(
+                        AppLogger.error(
-                            "Failed to rename imported image \(tempFileName) to \(deterministicName): \(error)"
+                            "Failed to rename imported image \(tempFileName) to \(deterministicName): \(error)",
+                            tag: LogTag.climbingData
                         )
                         deterministicImagePaths.append(tempFileName)
                     }
@@ -1078,7 +1133,8 @@ extension ClimbingDataManager {
         if needsUpdate {
             problems = updatedProblems
             saveProblems()
-            print("Migrated image paths for \(problems.count) problems")
+            AppLogger.info(
+                "Migrated image paths for \(problems.count) problems", tag: LogTag.climbingData)
         }
     }
 
@@ -1089,8 +1145,9 @@ extension ClimbingDataManager {
 
             // Log storage information for debugging
             let info = await ImageManager.shared.getStorageInfo()
-            print(
+            await AppLogger.debug(
-                "Image Storage: \(info.primaryCount) primary, \(info.backupCount) backup, \(info.totalSize / 1024)KB total"
+                "Image Storage: \(info.primaryCount) primary, \(info.backupCount) backup, \(info.totalSize / 1024)KB total",
+                tag: LogTag.climbingData
             )
         }.value
     }
@@ -1128,7 +1185,9 @@ extension ClimbingDataManager {
             }
 
             if !orphanedFiles.isEmpty {
-                print("Cleaned up \(orphanedFiles.count) orphaned image files")
+                AppLogger.info(
+                    "Cleaned up \(orphanedFiles.count) orphaned image files",
+                    tag: LogTag.climbingData)
             }
         }
     }
@@ -1145,7 +1204,7 @@ extension ClimbingDataManager {
     }
 
     func forceImageRecovery() {
-        print("User initiated force image recovery")
+        AppLogger.info("User initiated force image recovery", tag: LogTag.climbingData)
         ImageManager.shared.forceRecoveryMigration()
 
         // Refresh the UI after recovery
@@ -1153,7 +1212,7 @@ extension ClimbingDataManager {
     }
 
     func emergencyImageRestore() {
-        print("User initiated emergency image restore")
+        AppLogger.info("User initiated emergency image restore", tag: LogTag.climbingData)
         ImageManager.shared.emergencyImageRestore()
 
         // Refresh the UI after restore
@@ -1179,15 +1238,15 @@ extension ClimbingDataManager {
     }
 
     func testLiveActivity() {
-        print("🧪 Testing Live Activity functionality...")
+        AppLogger.info("Testing Live Activity functionality...", tag: LogTag.climbingData)
 
         // Check Live Activity availability
         let status = LiveActivityManager.shared.checkLiveActivityAvailability()
-        print(status)
+        AppLogger.info(status, tag: LogTag.climbingData)
 
         // Test with dummy data if we have a gym
         guard let testGym = gyms.first else {
-            print("ERROR: No gyms available for testing")
+            AppLogger.error("No gyms available for testing", tag: LogTag.climbingData)
             return
         }
 
@@ -1218,15 +1277,18 @@ extension ClimbingDataManager {
 
         // Only restart if session is actually active
         guard activeSession.status == .active else {
-            print(
+            AppLogger.warning(
-                "WARNING: Session exists but is not active (status: \(activeSession.status)), ending Live Activity"
+                "Session exists but is not active (status: \(activeSession.status)), ending Live Activity",
+                tag: LogTag.climbingData
             )
             await LiveActivityManager.shared.endLiveActivity()
             return
         }
 
         if let gym = gym(withId: activeSession.gymId) {
-            print("Checking Live Activity for active session at \(gym.name)")
+            AppLogger.info(
+                "Checking Live Activity for active session at \(gym.name)", tag: LogTag.climbingData
+            )
 
             // First cleanup any dismissed activities
             await LiveActivityManager.shared.cleanupDismissedActivities()
@@ -1241,7 +1303,9 @@ extension ClimbingDataManager {
 
     /// Call this when app becomes active to check for Live Activity restart
     func onAppBecomeActive() {
-        print("App became active - checking Live Activity status")
+        let logTag = "ClimbingData"
+        AppLogger.info(
+            "App became active - checking Live Activity status", tag: logTag)
         Task {
             await checkAndRestartLiveActivity()
         }
@@ -1249,35 +1313,46 @@ extension ClimbingDataManager {
 
     /// Call this when app enters background to update Live Activity
     func onAppEnterBackground() {
-        print("App entering background - updating Live Activity if needed")
+        let logTag = "ClimbingData"
+        AppLogger.info(
+            "App entering background - updating Live Activity if needed", tag: logTag)
         Task {
             await updateLiveActivityData()
         }
     }
 
     /// Setup notifications for Live Activity events
-    private func setupLiveActivityNotifications() {
+    nonisolated private func setupLiveActivityNotifications() {
+        let notificationName = Notification.Name("liveActivityDismissed")
+        let logTag = "ClimbingData"
+
         liveActivityObserver = NotificationCenter.default.addObserver(
-            forName: .liveActivityDismissed,
+            forName: notificationName,
             object: nil,
             queue: .main
         ) { [weak self] _ in
-            print("🔔 Received Live Activity dismissed notification - attempting restart")
             Task { @MainActor in
+                AppLogger.info(
+                    "Received Live Activity dismissed notification - attempting restart",
+                    tag: logTag)
                 await self?.handleLiveActivityDismissed()
             }
         }
     }
 
-    private func setupMigrationNotifications() {
+    nonisolated private func setupMigrationNotifications() {
+        let logTag = "ClimbingData"
+
         migrationObserver = NotificationCenter.default.addObserver(
             forName: NSNotification.Name("ImageMigrationCompleted"),
             object: nil,
             queue: .main
         ) { [weak self] notification in
             if let updateCount = notification.userInfo?["updateCount"] as? Int {
-                print("🔔 Image migration completed with \(updateCount) updates - reloading data")
                 Task { @MainActor in
+                    AppLogger.info(
+                        "Image migration completed with \(updateCount) updates - reloading data",
+                        tag: logTag)
                     self?.loadProblems()
                 }
             }
@@ -1293,7 +1368,9 @@ extension ClimbingDataManager {
             return
         }
 
-        print("Attempting to restart dismissed Live Activity for \(gym.name)")
+        AppLogger.info(
+            "Attempting to restart dismissed Live Activity for \(gym.name)",
+            tag: LogTag.climbingData)
 
         // Wait a bit before restarting to avoid frequency limits
         try? await Task.sleep(nanoseconds: 2_000_000_000)  // 2 seconds
@@ -1333,11 +1410,20 @@ extension ClimbingDataManager {
             activeSession.status == .active,
             let gym = gym(withId: activeSession.gymId)
         else {
-            print("WARNING: Live Activity update skipped - no active session or gym")
+            AppLogger.warning(
+                "Live Activity update skipped - no active session or gym",
+                tag: LogTag.climbingData
+            )
             if let session = activeSession {
-                print("  Session ID: \(session.id)")
+                AppLogger.debug(
-                print("  Session Status: \(session.status)")
+                    """
-                print("  Gym ID: \(session.gymId)")
+                    Skipped session details:
+                      Session ID: \(session.id)
+                      Session Status: \(session.status)
+                      Gym ID: \(session.gymId)
+                    """,
+                    tag: LogTag.climbingData
+                )
             }
             return
         }
@@ -1357,14 +1443,17 @@ extension ClimbingDataManager {
             elapsedInterval = 0
         }
 
-        print("Live Activity Update Debug:")
+        AppLogger.debug(
-        print("  Session ID: \(activeSession.id)")
+            """
-        print("  Gym: \(gym.name)")
+            Live Activity Update Debug:
-        print("  Total attempts in session: \(totalAttempts)")
+              Session ID: \(activeSession.id)
-        print("  Completed problems: \(completedProblems)")
+              Gym: \(gym.name)
-        print("  Elapsed time: \(elapsedInterval) seconds")
+              Total attempts in session: \(totalAttempts)
-        print(
+              Completed problems: \(completedProblems)
-            "  All attempts for session: \(attemptsForSession.map { "\($0.result) - Problem: \($0.problemId)" })"
+              Elapsed time: \(elapsedInterval) seconds
+              All attempts for session: \(attemptsForSession.map { "\($0.result) - Problem: \($0.problemId)" })
+            """,
+            tag: LogTag.climbingData
         )
 
         Task {

ios/Ascently/ViewModels/LiveActivityManager.swift

@@ -8,6 +8,7 @@ extension Notification.Name {
 @MainActor
 final class LiveActivityManager {
     static let shared = LiveActivityManager()
+    private static let logTag = "LiveActivity"
     private init() {}
 
     nonisolated(unsafe) private var currentActivity: Activity<SessionActivityAttributes>?
@@ -30,11 +31,12 @@ final class LiveActivityManager {
             let isStillActive = activities.contains { $0.id == currentActivity.id }
 
             if isStillActive {
-                print("Live Activity still running: \(currentActivity.id)")
+                AppLogger.debug("Live Activity still running: \(currentActivity.id)", tag: Self.logTag)
                 return
             } else {
-                print(
+                AppLogger.warning(
-                    "WARNING: Tracked Live Activity \(currentActivity.id) was dismissed, clearing reference"
+                    "Tracked Live Activity \(currentActivity.id) was dismissed, clearing reference",
+                    tag: Self.logTag
                 )
                 self.currentActivity = nil
             }
@@ -43,18 +45,18 @@ final class LiveActivityManager {
         // 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")
+            AppLogger.info("Found existing Live Activity: \(existingActivity.id), using it", tag: Self.logTag)
             self.currentActivity = existingActivity
             return
         }
 
-        print("No Live Activity found, restarting for existing session")
+        AppLogger.info("No Live Activity found, restarting for existing session", tag: Self.logTag)
         await startLiveActivity(for: activeSession, gymName: gymName)
     }
 
     /// Call this when a ClimbSession starts to begin a Live Activity
     func startLiveActivity(for session: ClimbSession, gymName: String) async {
-        print("Starting Live Activity for gym: \(gymName)")
+        AppLogger.info("Starting Live Activity for gym: \(gymName)", tag: Self.logTag)
 
         await endLiveActivity()
 
@@ -80,18 +82,26 @@ final class LiveActivityManager {
                 pushType: nil
             )
             self.currentActivity = activity
-            print("Live Activity started successfully: \(activity.id)")
+            AppLogger.info("Live Activity started successfully: \(activity.id)", tag: Self.logTag)
         } catch {
-            print("ERROR: Failed to start live activity: \(error)")
+            AppLogger.error(
-            print("Error details: \(error.localizedDescription)")
+                """
+                Failed to start live activity: \(error)
+                Details: \(error.localizedDescription)
+                """,
+                tag: Self.logTag
+            )
 
             // Check specific error types
             if error.localizedDescription.contains("authorization") {
-                print("Authorization error - check Live Activity permissions in Settings")
+                AppLogger.warning(
+                    "Authorization error - check Live Activity permissions in Settings",
+                    tag: Self.logTag
+                )
             } else if error.localizedDescription.contains("content") {
-                print("Content error - check ActivityAttributes structure")
+                AppLogger.warning("Content error - check ActivityAttributes structure", tag: Self.logTag)
             } else if error.localizedDescription.contains("frequencyLimited") {
-                print("Frequency limited - too many Live Activities started recently")
+                AppLogger.warning("Frequency limited - too many Live Activities started recently", tag: Self.logTag)
             }
         }
     }
@@ -100,7 +110,7 @@ final class LiveActivityManager {
     func updateLiveActivity(elapsed: TimeInterval, totalAttempts: Int, completedProblems: Int) async
     {
         guard let currentActivity = currentActivity else {
-            print("WARNING: No current activity to update")
+            AppLogger.warning("No current activity to update", tag: Self.logTag)
             return
         }
 
@@ -109,15 +119,17 @@ final class LiveActivityManager {
         let isStillActive = activities.contains { $0.id == currentActivity.id }
 
         if !isStillActive {
-            print(
+            AppLogger.warning(
-                "WARNING: Tracked Live Activity \(currentActivity.id) is no longer active, clearing reference"
+                "Tracked Live Activity \(currentActivity.id) is no longer active, clearing reference",
+                tag: Self.logTag
             )
             self.currentActivity = nil
             return
         }
 
-        print(
+        AppLogger.debug(
-            "Updating Live Activity - Attempts: \(totalAttempts), Completed: \(completedProblems)"
+            "Updating Live Activity - Attempts: \(totalAttempts), Completed: \(completedProblems)",
+            tag: Self.logTag
         )
 
         let updatedContentState = SessionActivityAttributes.ContentState(
@@ -137,26 +149,26 @@ final class LiveActivityManager {
 
         // First end the tracked activity if it exists
         if let currentActivity {
-            print("Ending tracked Live Activity: \(currentActivity.id)")
+            AppLogger.info("Ending tracked Live Activity: \(currentActivity.id)", tag: Self.logTag)
             nonisolated(unsafe) let activity = currentActivity
             await activity.end(nil, dismissalPolicy: .immediate)
             self.currentActivity = nil
-            print("Tracked Live Activity ended successfully")
+            AppLogger.info("Tracked Live Activity ended successfully", tag: Self.logTag)
         }
 
         // Force end ALL active activities of our type to ensure cleanup
-        print("Checking for any remaining active activities...")
+        AppLogger.debug("Checking for any remaining active activities...", tag: Self.logTag)
         let activities = Activity<SessionActivityAttributes>.activities
 
         if activities.isEmpty {
-            print("No additional activities found")
+            AppLogger.debug("No additional activities found", tag: Self.logTag)
         } else {
-            print("Found \(activities.count) additional active activities, ending them...")
+            AppLogger.info("Found \(activities.count) additional active activities, ending them...", tag: Self.logTag)
             for activity in activities {
-                print("Force ending activity: \(activity.id)")
+                AppLogger.debug("Force ending activity: \(activity.id)", tag: Self.logTag)
                 await activity.end(nil, dismissalPolicy: .immediate)
             }
-            print("All Live Activities ended successfully")
+            AppLogger.info("All Live Activities ended successfully", tag: Self.logTag)
         }
     }
 
@@ -174,7 +186,7 @@ final class LiveActivityManager {
             • All Active Activities: \(allActivities.count)
             """
 
-        print(message)
+        AppLogger.info(message, tag: Self.logTag)
         return message
     }
 
@@ -185,7 +197,7 @@ final class LiveActivityManager {
         if let currentActivity = currentActivity {
             let isStillActive = activities.contains { $0.id == currentActivity.id }
             if !isStillActive {
-                print("Cleaning up dismissed Live Activity: \(currentActivity.id)")
+                AppLogger.info("Cleaning up dismissed Live Activity: \(currentActivity.id)", tag: Self.logTag)
                 self.currentActivity = nil
             }
         }
@@ -195,7 +207,7 @@ final class LiveActivityManager {
     func startHealthChecks() {
         stopHealthChecks()  // Stop any existing timer
 
-        print("🩺 Starting Live Activity health checks")
+        AppLogger.debug("🩺 Starting Live Activity health checks", tag: Self.logTag)
         healthCheckTimer = Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) {
             [weak self] _ in
             Task { @MainActor [weak self] in
@@ -208,7 +220,7 @@ final class LiveActivityManager {
     func stopHealthChecks() {
         healthCheckTimer?.invalidate()
         healthCheckTimer = nil
-        print("Stopped Live Activity health checks")
+        AppLogger.debug("Stopped Live Activity health checks", tag: Self.logTag)
     }
 
     /// Perform a health check on the current Live Activity
@@ -221,14 +233,14 @@ final class LiveActivityManager {
         // Only perform health check if it's been at least 25 seconds
         guard timeSinceLastCheck >= 25 else { return }
 
-        print("🩺 Performing Live Activity health check")
+        AppLogger.debug("🩺 Performing Live Activity health check", tag: Self.logTag)
         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")
+            AppLogger.warning("Health check failed - Live Activity was dismissed", tag: Self.logTag)
             self.currentActivity = nil
 
             // Notify that we need to restart
@@ -237,7 +249,7 @@ final class LiveActivityManager {
                 object: nil
             )
         } else {
-            print("Live Activity health check passed")
+            AppLogger.debug("Live Activity health check passed", tag: Self.logTag)
         }
     }
 

ios/Ascently/Views/AddEdit/AddAttemptView.swift

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

ios/Ascently/Views/AddEdit/AddEditGymView.swift

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

ios/Ascently/Views/AddEdit/AddEditProblemView.swift

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

ios/Ascently/Views/AddEdit/AddEditSessionView.swift

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

ios/Ascently/Views/AnalyticsView.swift

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

ios/Ascently/Views/CalendarView.swift

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

ios/Ascently/Views/Detail/GymDetailView.swift

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

ios/Ascently/Views/Detail/ProblemDetailView.swift

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

ios/Ascently/Views/Detail/SessionDetailView.swift

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

ios/Ascently/Views/GymsView.swift

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

ios/Ascently/Views/LiveActivityDebugView.swift

@@ -196,7 +196,7 @@ struct LiveActivityDebugView: View {
         }
 
         isTestRunning = true
-        appendDebugOutput("🧪 Starting Live Activity test...")
+        appendDebugOutput("Starting Live Activity test...")
 
         Task {
             defer {

ios/Ascently/Views/ProblemsView.swift

@@ -2,15 +2,22 @@ import SwiftUI
 
 struct ProblemsView: View {
     @EnvironmentObject var dataManager: ClimbingDataManager
+    @EnvironmentObject var themeManager: ThemeManager
     @State private var showingAddProblem = false
     @State private var selectedClimbType: ClimbType?
     @State private var selectedGym: Gym?
     @State private var searchText = ""
     @State private var showingSearch = false
+    @State private var showingFilters = false
     @FocusState private var isSearchFocused: Bool
 
     @State private var cachedFilteredProblems: [Problem] = []
 
+    // State moved from ProblemsList
+    @State private var problemToDelete: Problem?
+    @State private var problemToEdit: Problem?
+    @State private var animationKey = 0
+
     private func updateFilteredProblems() {
         Task(priority: .userInitiated) {
             let result = await computeFilteredProblems()
@@ -70,6 +77,174 @@ struct ProblemsView: View {
     var body: some View {
         NavigationStack {
             Group {
+                if cachedFilteredProblems.isEmpty {
+                    VStack(spacing: 0) {
+                        headerContent
+                        
+                        EmptyProblemsView(
+                            isEmpty: dataManager.problems.isEmpty,
+                            isFiltered: !dataManager.problems.isEmpty
+                        )
+                    }
+                } else {
+                    List {
+                        if showingSearch {
+                            Section {
+                                headerContent
+                            }
+                            .listRowInsets(EdgeInsets())
+                            .listRowSeparator(.hidden)
+                            .listRowBackground(Color.clear)
+                        }
+
+                        ForEach(cachedFilteredProblems) { problem in
+                            NavigationLink(destination: ProblemDetailView(problemId: problem.id)) {
+                                ProblemRow(problem: problem)
+                            }
+                            .swipeActions(edge: .trailing, allowsFullSwipe: false) {
+                                Button(role: .destructive) {
+                                    problemToDelete = problem
+                                } label: {
+                                    Label("Delete", systemImage: "trash")
+                                }
+
+                                Button {
+                                    withAnimation(.spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1))
+                                    {
+                                        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: {
+                                    HStack {
+                                        Image(systemName: "pencil")
+                                        Text("Edit")
+                                    }
+                                }
+                                .tint(themeManager.accentColor)
+                            }
+                        }
+                    }
+                    .listStyle(.plain)
+                    .animation(
+                        .spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1),
+                        value: animationKey
+                    )
+                }
+            }
+            .navigationTitle("Problems")
+            .navigationBarTitleDisplayMode(.automatic)
+            .toolbar {
+                ToolbarItemGroup(placement: .navigationBarTrailing) {
+                    if dataManager.isSyncing {
+                        HStack(spacing: 2) {
+                            ProgressView()
+                                .progressViewStyle(CircularProgressViewStyle(tint: themeManager.accentColor))
+                                .scaleEffect(0.6)
+                        }
+                        .padding(.horizontal, 6)
+                        .padding(.vertical, 3)
+                        .background(
+                            Circle()
+                                .fill(.regularMaterial)
+                        )
+                        .transition(.scale.combined(with: .opacity))
+                        .animation(
+                            .easeInOut(duration: 0.2), value: dataManager.isSyncing
+                        )
+                    }
+
+                    Button(action: {
+                        withAnimation(.easeInOut(duration: 0.3)) {
+                            showingSearch.toggle()
+                            if showingSearch {
+                                isSearchFocused = true
+                            } else {
+                                searchText = ""
+                                isSearchFocused = false
+                            }
+                        }
+                    }) {
+                        Image(systemName: showingSearch ? "xmark.circle.fill" : "magnifyingglass")
+                            .font(.system(size: 16, weight: .medium))
+                            .foregroundColor(showingSearch ? .secondary : themeManager.accentColor)
+                    }
+
+                    Button(action: {
+                        showingFilters = true
+                    }) {
+                        Image(systemName: (selectedClimbType != nil || selectedGym != nil) ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease.circle")
+                            .font(.system(size: 16, weight: .medium))
+                            .foregroundColor(themeManager.accentColor)
+                    }
+
+                    if !dataManager.gyms.isEmpty {
+                        Button("Add") {
+                            showingAddProblem = true
+                        }
+                    }
+                }
+            }
+            .sheet(isPresented: $showingAddProblem) {
+                AddEditProblemView()
+            }
+            .sheet(isPresented: $showingFilters) {
+                FilterSheet(
+                    selectedClimbType: $selectedClimbType,
+                    selectedGym: $selectedGym,
+                    filteredProblems: cachedFilteredProblems
+                )
+                .presentationDetents([.height(320)])
+            }
+            .sheet(item: $problemToEdit) { problem in
+                AddEditProblemView(problemId: problem.id)
+            }
+            .alert("Delete Problem", isPresented: .constant(problemToDelete != nil)) {
+                Button("Cancel", role: .cancel) {
+                    problemToDelete = nil
+                }
+                Button("Delete", role: .destructive) {
+                    if let problem = problemToDelete {
+                        dataManager.deleteProblem(problem)
+                        problemToDelete = nil
+                    }
+                }
+            } message: {
+                Text(
+                    "Are you sure you want to delete this problem? This will also delete all associated attempts."
+                )
+            }
+        }
+        .onAppear {
+            updateFilteredProblems()
+        }
+        .onChange(of: dataManager.problems) {
+            updateFilteredProblems()
+        }
+        .onChange(of: searchText) {
+            updateFilteredProblems()
+        }
+        .onChange(of: selectedClimbType) {
+            updateFilteredProblems()
+        }
+        .onChange(of: selectedGym) {
+            updateFilteredProblems()
+        }
+        .onChange(of: cachedFilteredProblems) {
+            animationKey += 1
+        }
+    }
+
+    @ViewBuilder
+    private var headerContent: some View {
         VStack(spacing: 0) {
             if showingSearch {
                 HStack(spacing: 8) {
@@ -104,98 +279,16 @@ struct ProblemsView: View {
                 }
                 .padding(.horizontal)
                 .padding(.top, 8)
+                .padding(.bottom, 8)
                 .animation(.easeInOut(duration: 0.3), value: showingSearch)
             }
-
-                    if !dataManager.problems.isEmpty && !showingSearch {
-                        FilterSection(
-                            selectedClimbType: $selectedClimbType,
-                            selectedGym: $selectedGym,
-                            filteredProblems: cachedFilteredProblems
-                        )
-                        .padding()
-                        .background(.regularMaterial)
-                    }
-
-                    if cachedFilteredProblems.isEmpty {
-                        EmptyProblemsView(
-                            isEmpty: dataManager.problems.isEmpty,
-                            isFiltered: !dataManager.problems.isEmpty
-                        )
-                    } else {
-                        ProblemsList(problems: cachedFilteredProblems)
-                    }
-                }
-            }
-            .navigationTitle("Problems")
-            .navigationBarTitleDisplayMode(.automatic)
-            .toolbar {
-                ToolbarItemGroup(placement: .navigationBarTrailing) {
-                    if dataManager.isSyncing {
-                        HStack(spacing: 2) {
-                            ProgressView()
-                                .progressViewStyle(CircularProgressViewStyle(tint: .blue))
-                                .scaleEffect(0.6)
-                        }
-                        .padding(.horizontal, 6)
-                        .padding(.vertical, 3)
-                        .background(
-                            Circle()
-                                .fill(.regularMaterial)
-                        )
-                        .transition(.scale.combined(with: .opacity))
-                        .animation(
-                            .easeInOut(duration: 0.2), value: dataManager.isSyncing
-                        )
-                    }
-
-                    Button(action: {
-                        withAnimation(.easeInOut(duration: 0.3)) {
-                            showingSearch.toggle()
-                            if showingSearch {
-                                isSearchFocused = true
-                            } else {
-                                searchText = ""
-                                isSearchFocused = false
-                            }
-                        }
-                    }) {
-                        Image(systemName: showingSearch ? "xmark.circle.fill" : "magnifyingglass")
-                            .font(.system(size: 16, weight: .medium))
-                            .foregroundColor(showingSearch ? .secondary : .blue)
-                    }
-
-                    if !dataManager.gyms.isEmpty {
-                        Button("Add") {
-                            showingAddProblem = true
-                        }
-                    }
-                }
-            }
-            .sheet(isPresented: $showingAddProblem) {
-                AddEditProblemView()
-            }
-        }
-        .onAppear {
-            updateFilteredProblems()
-        }
-        .onChange(of: dataManager.problems) {
-            updateFilteredProblems()
-        }
-        .onChange(of: searchText) {
-            updateFilteredProblems()
-        }
-        .onChange(of: selectedClimbType) {
-            updateFilteredProblems()
-        }
-        .onChange(of: selectedGym) {
-            updateFilteredProblems()
         }
     }
 }
 
 struct FilterSection: View {
     @EnvironmentObject var dataManager: ClimbingDataManager
+    @EnvironmentObject var themeManager: ThemeManager
     @Binding var selectedClimbType: ClimbType?
     @Binding var selectedGym: Gym?
     let filteredProblems: [Problem]
@@ -278,6 +371,7 @@ struct FilterChip: View {
     let title: String
     let isSelected: Bool
     let action: () -> Void
+    @EnvironmentObject var themeManager: ThemeManager
 
     var body: some View {
         Button(action: action) {
@@ -288,94 +382,21 @@ struct FilterChip: View {
                 .padding(.vertical, 6)
                 .background(
                     RoundedRectangle(cornerRadius: 16)
-                        .fill(isSelected ? .blue : .clear)
+                        .fill(isSelected ? themeManager.accentColor : .clear)
-                        .stroke(.blue, lineWidth: 1)
+                        .stroke(themeManager.accentColor, lineWidth: 1)
                 )
-                .foregroundColor(isSelected ? .white : .blue)
+                .foregroundColor(isSelected ? themeManager.contrastingTextColor : themeManager.accentColor)
         }
         .buttonStyle(.plain)
     }
 }
 
-struct ProblemsList: View {
-    let problems: [Problem]
-    @EnvironmentObject var dataManager: ClimbingDataManager
-    @State private var problemToDelete: Problem?
-    @State private var problemToEdit: Problem?
-    @State private var animationKey = 0
 
-    var body: some View {
-        List(problems, id: \.id) { problem in
-            NavigationLink(destination: ProblemDetailView(problemId: problem.id)) {
-                ProblemRow(problem: problem)
-            }
-            .swipeActions(edge: .trailing, allowsFullSwipe: false) {
-                Button(role: .destructive) {
-                    problemToDelete = problem
-                } label: {
-                    Label("Delete", systemImage: "trash")
-                }
-
-                Button {
-                    // Use a spring animation for more natural movement
-                    withAnimation(.spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1))
-                    {
-                        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: {
-                    HStack {
-                        Image(systemName: "pencil")
-                        Text("Edit")
-                    }
-                }
-                .tint(.blue)
-            }
-        }
-        .animation(
-            .spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1),
-            value: animationKey
-        )
-        .onChange(of: problems) {
-            animationKey += 1
-        }
-        .listStyle(.plain)
-        .scrollContentBackground(.hidden)
-        .scrollIndicators(.hidden)
-        .clipped()
-        .alert("Delete Problem", isPresented: .constant(problemToDelete != nil)) {
-            Button("Cancel", role: .cancel) {
-                problemToDelete = nil
-            }
-            Button("Delete", role: .destructive) {
-                if let problem = problemToDelete {
-                    dataManager.deleteProblem(problem)
-                    problemToDelete = nil
-                }
-            }
-        } message: {
-            Text(
-                "Are you sure you want to delete this problem? This will also delete all associated attempts."
-            )
-        }
-        .sheet(item: $problemToEdit) { problem in
-            AddEditProblemView(problemId: problem.id)
-        }
-    }
-}
 
 struct ProblemRow: View {
     let problem: Problem
     @EnvironmentObject var dataManager: ClimbingDataManager
+    @EnvironmentObject var themeManager: ThemeManager
 
     private var gym: Gym? {
         dataManager.gym(withId: problem.gymId)
@@ -408,7 +429,7 @@ struct ProblemRow: View {
                         if !problem.imagePaths.isEmpty {
                             Image(systemName: "photo")
                                 .font(.system(size: 14, weight: .medium))
-                                .foregroundColor(.blue)
+                                .foregroundColor(themeManager.accentColor)
                         }
 
                         if isCompleted {
@@ -420,7 +441,7 @@ struct ProblemRow: View {
                         Text(problem.difficulty.grade)
                             .font(.title2)
                             .fontWeight(.bold)
-                            .foregroundColor(.blue)
+                            .foregroundColor(themeManager.accentColor)
                     }
 
                     Text(problem.climbType.displayName)
@@ -445,9 +466,9 @@ struct ProblemRow: View {
                                 .padding(.vertical, 2)
                                 .background(
                                     RoundedRectangle(cornerRadius: 4)
-                                        .fill(.blue.opacity(0.1))
+                                        .fill(themeManager.accentColor.opacity(0.1))
                                 )
-                                .foregroundColor(.blue)
+                                .foregroundColor(themeManager.accentColor)
                         }
                     }
                 }
@@ -524,6 +545,71 @@ struct EmptyProblemsView: View {
     }
 }
 
+struct FilterSheet: View {
+    @Binding var selectedClimbType: ClimbType?
+    @Binding var selectedGym: Gym?
+    let filteredProblems: [Problem]
+    @Environment(\.dismiss) var dismiss
+    @EnvironmentObject var themeManager: ThemeManager
+    
+    var body: some View {
+        NavigationStack {
+            ScrollView {
+                FilterSection(
+                    selectedClimbType: $selectedClimbType,
+                    selectedGym: $selectedGym,
+                    filteredProblems: filteredProblems
+                )
+                .padding()
+            }
+            .navigationTitle("Filters")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button(action: {
+                        dismiss()
+                    }) {
+                        Text("Done")
+                            .font(.subheadline)
+                            .fontWeight(.semibold)
+                            .padding(.horizontal, 16)
+                            .padding(.vertical, 6)
+                            .background(.ultraThinMaterial)
+                            .clipShape(Capsule())
+                            .overlay(
+                                Capsule()
+                                    .stroke(Color.secondary.opacity(0.2), lineWidth: 0.5)
+                            )
+                            .foregroundColor(themeManager.accentColor)
+                    }
+                }
+                
+                ToolbarItem(placement: .navigationBarLeading) {
+                    if selectedClimbType != nil || selectedGym != nil {
+                        Button(action: {
+                            selectedClimbType = nil
+                            selectedGym = nil
+                        }) {
+                            Text("Reset")
+                                .font(.subheadline)
+                                .fontWeight(.medium)
+                                .padding(.horizontal, 16)
+                                .padding(.vertical, 6)
+                                .background(.ultraThinMaterial)
+                                .clipShape(Capsule())
+                                .overlay(
+                                    Capsule()
+                                        .stroke(Color.secondary.opacity(0.2), lineWidth: 0.5)
+                                )
+                                .foregroundColor(.red)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
 #Preview {
     ProblemsView()
         .environmentObject(ClimbingDataManager.preview)

ios/Ascently/Views/SettingsView.swift

@@ -9,6 +9,7 @@ enum SheetType {
 
 struct SettingsView: View {
     @EnvironmentObject var dataManager: ClimbingDataManager
+    @EnvironmentObject var themeManager: ThemeManager
     @State private var activeSheet: SheetType?
 
     var body: some View {
@@ -20,6 +21,8 @@ struct SettingsView: View {
                 HealthKitSection()
                     .environmentObject(dataManager.healthKitService)
 
+                AppearanceSection()
+
                 DataManagementSection(
                     activeSheet: $activeSheet
                 )
@@ -75,8 +78,90 @@ extension SheetType: Identifiable {
     }
 }
 
+struct AppearanceSection: View {
+    @EnvironmentObject var themeManager: ThemeManager
+    
+    let columns = [
+        GridItem(.adaptive(minimum: 44))
+    ]
+    
+    var body: some View {
+        Section("Appearance") {
+            VStack(alignment: .leading, spacing: 12) {
+                Text("Accent Color")
+                    .font(.caption)
+                    .foregroundColor(.secondary)
+                    .textCase(.uppercase)
+                
+                LazyVGrid(columns: columns, spacing: 12) {
+                    ForEach(ThemeManager.presetColors, id: \.self) { color in
+                        Circle()
+                            .fill(color)
+                            .frame(width: 44, height: 44)
+                            .overlay(
+                                ZStack {
+                                    if isSelected(color) {
+                                        Image(systemName: "checkmark")
+                                            .font(.headline)
+                                            .foregroundColor(.white)
+                                            .shadow(radius: 1)
+                                    }
+                                }
+                            )
+                            .onTapGesture {
+                                withAnimation {
+                                    themeManager.accentColor = color
+                                }
+                            }
+                            .accessibilityLabel(colorDescription(for: color))
+                            .accessibilityAddTraits(isSelected(color) ? .isSelected : [])
+                    }
+                }
+                .padding(.vertical, 8)
+            }
+            
+            if !isSelected(.blue) {
+                Button("Reset to Default") {
+                    withAnimation {
+                        themeManager.resetToDefault()
+                    }
+                }
+                .foregroundColor(.red)
+            }
+        }
+    }
+    
+    private func isSelected(_ color: Color) -> Bool {
+        // Compare using UIColor to handle different Color initializers
+        let selectedUIColor = UIColor(themeManager.accentColor)
+        let targetUIColor = UIColor(color)
+        
+        // Simple equality check might fail for some system colors, so we check components if needed
+        // But usually UIColor equality is robust enough for system colors
+        return selectedUIColor == targetUIColor
+    }
+    
+    private func colorDescription(for color: Color) -> String {
+        switch color {
+        case .blue: return "Blue"
+        case .purple: return "Purple"
+        case .pink: return "Pink"
+        case .red: return "Red"
+        case .orange: return "Orange"
+        case .green: return "Green"
+        case .teal: return "Teal"
+        case .indigo: return "Indigo"
+        case .mint: return "Mint"
+        case Color(uiColor: .systemBrown): return "Brown"
+        case Color(uiColor: .systemCyan): return "Cyan"
+        default: return "Color"
+        }
+    }
+}
+
 struct DataManagementSection: View {
     @EnvironmentObject var dataManager: ClimbingDataManager
+    @EnvironmentObject var themeManager: ThemeManager
     @Binding var activeSheet: SheetType?
     @State private var showingResetAlert = false
     @State private var isExporting = false
@@ -84,6 +169,8 @@ struct DataManagementSection: View {
     @State private var isDeletingImages = false
     @State private var showingDeleteImagesAlert = false
 
+    private static let logTag = "DataManagementSection"
+
     var body: some View {
         Section("Data Management") {
             // Export Data
@@ -98,7 +185,7 @@ struct DataManagementSection: View {
                             .foregroundColor(.secondary)
                     } else {
                         Image(systemName: "square.and.arrow.up")
-                            .foregroundColor(.blue)
+                            .foregroundColor(themeManager.accentColor)
                         Text("Export Data")
                     }
                     Spacer()
@@ -217,13 +304,14 @@ struct DataManagementSection: View {
                     try fileManager.removeItem(at: imageFile)
                     deletedCount += 1
                 } catch {
-                    print("Failed to delete image: \(imageFile.lastPathComponent)")
+                    AppLogger.error(
+                        "Failed to delete image: \(imageFile.lastPathComponent)", tag: Self.logTag)
                 }
             }
 
-            print("Deleted \(deletedCount) image files")
+            AppLogger.info("Deleted \(deletedCount) image files", tag: Self.logTag)
         } catch {
-            print("Failed to access images directory: \(error)")
+            AppLogger.error("Failed to access images directory: \(error)", tag: Self.logTag)
         }
 
         // Delete all images from backup directory
@@ -235,7 +323,7 @@ struct DataManagementSection: View {
                 try? fileManager.removeItem(at: backupFile)
             }
         } catch {
-            print("Failed to access backup directory: \(error)")
+            AppLogger.error("Failed to access backup directory: \(error)", tag: Self.logTag)
         }
 
         // Clear image paths from all problems
@@ -250,6 +338,7 @@ struct DataManagementSection: View {
 }
 
 struct AppInfoSection: View {
+    @EnvironmentObject var themeManager: ThemeManager
     private var appVersion: String {
         Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "Unknown"
     }
@@ -260,23 +349,9 @@ struct AppInfoSection: View {
 
     var body: some View {
         Section("App Information") {
-            HStack {
-                Image("AppLogo")
-                    .resizable()
-                    .frame(width: 24, height: 24)
-                VStack(alignment: .leading) {
-                    Text("Ascently")
-                        .font(.headline)
-                    Text("Track your climbing progress")
-                        .font(.caption)
-                        .foregroundColor(.secondary)
-                }
-                Spacer()
-            }
-
             HStack {
                 Image(systemName: "info.circle")
-                    .foregroundColor(.blue)
+                    .foregroundColor(themeManager.accentColor)
                 Text("Version")
                 Spacer()
                 Text("\(appVersion) (\(buildNumber))")
@@ -289,18 +364,21 @@ struct AppInfoSection: View {
 struct ExportDataView: View {
     let data: Data
     @Environment(\.dismiss) private var dismiss
+    @EnvironmentObject var themeManager: ThemeManager
     @State private var tempFileURL: URL?
     @State private var isCreatingFile = true
 
+    private static let logTag = "ExportDataView"
+
     var body: some View {
         NavigationStack {
             VStack(spacing: 30) {
                 if isCreatingFile {
-                    // Loading state - more prominent
+                    // Loading state
                     VStack(spacing: 20) {
                         ProgressView()
                             .scaleEffect(1.5)
-                            .tint(.blue)
+                            .tint(themeManager.accentColor)
 
                         Text("Preparing Your Export")
                             .font(.title2)
@@ -339,12 +417,12 @@ struct ExportDataView: View {
                             ) {
                                 Label("Share Data", systemImage: "square.and.arrow.up")
                                     .font(.headline)
-                                    .foregroundColor(.white)
+                                    .foregroundColor(themeManager.contrastingTextColor)
                                     .frame(maxWidth: .infinity)
                                     .padding()
                                     .background(
                                         RoundedRectangle(cornerRadius: 12)
-                                            .fill(.blue)
+                                            .fill(themeManager.accentColor)
                                     )
                             }
                             .padding(.horizontal)
@@ -380,6 +458,7 @@ struct ExportDataView: View {
     }
 
     private func createTempFile() {
+        let logTag = Self.logTag  // Capture before entering background queue
         DispatchQueue.global(qos: .userInitiated).async {
             do {
                 let formatter = ISO8601DateFormatter()
@@ -394,7 +473,9 @@ struct ExportDataView: View {
                         for: .documentDirectory, in: .userDomainMask
                     ).first
                 else {
-                    print("Could not access Documents directory")
+                    Task { @MainActor in
+                        AppLogger.error("Could not access Documents directory", tag: logTag)
+                    }
                     DispatchQueue.main.async {
                         self.isCreatingFile = false
                     }
@@ -410,7 +491,9 @@ struct ExportDataView: View {
                     self.isCreatingFile = false
                 }
             } catch {
-                print("Failed to create export file: \(error)")
+                Task { @MainActor in
+                    AppLogger.error("Failed to create export file: \(error)", tag: logTag)
+                }
                 DispatchQueue.main.async {
                     self.isCreatingFile = false
                 }
@@ -420,10 +503,12 @@ struct ExportDataView: View {
 
     private func cleanupTempFile() {
         if let fileURL = tempFileURL {
+            let logTag = Self.logTag  // Capture before entering async closure
             // Clean up after a delay to ensure sharing is complete
             DispatchQueue.main.asyncAfter(deadline: .now() + 5.0) {
                 try? FileManager.default.removeItem(at: fileURL)
-                print("Cleaned up export file: \(fileURL.lastPathComponent)")
+                AppLogger.debug(
+                    "Cleaned up export file: \(fileURL.lastPathComponent)", tag: logTag)
             }
         }
     }
@@ -432,9 +517,12 @@ struct ExportDataView: View {
 struct SyncSection: View {
     @EnvironmentObject var syncService: SyncService
     @EnvironmentObject var dataManager: ClimbingDataManager
+    @EnvironmentObject var themeManager: ThemeManager
     @State private var showingSyncSettings = false
     @State private var showingDisconnectAlert = false
 
+    private static let logTag = "SyncSection"
+
     var body: some View {
         Section("Sync") {
             // Sync Status
@@ -475,7 +563,7 @@ struct SyncSection: View {
             }) {
                 HStack {
                     Image(systemName: "gear")
-                        .foregroundColor(.blue)
+                        .foregroundColor(themeManager.accentColor)
                     Text("Configure Server")
                     Spacer()
                     Image(systemName: "chevron.right")
@@ -579,11 +667,14 @@ struct SyncSection: View {
     }
 
     private func performSync() {
+        let logTag = Self.logTag  // Capture before entering async context
         Task {
             do {
                 try await syncService.syncWithServer(dataManager: dataManager)
             } catch {
-                print("Sync failed: \(error)")
+                await MainActor.run {
+                    AppLogger.error("Sync failed: \(error)", tag: logTag)
+                }
             }
         }
     }
@@ -591,6 +682,7 @@ struct SyncSection: View {
 
 struct SyncSettingsView: View {
     @EnvironmentObject var syncService: SyncService
+    @EnvironmentObject var themeManager: ThemeManager
     @Environment(\.dismiss) private var dismiss
     @State private var serverURL: String = ""
     @State private var authToken: String = ""
@@ -641,7 +733,7 @@ struct SyncSettingsView: View {
                                     .foregroundColor(.secondary)
                             } else {
                                 Image(systemName: "network")
-                                    .foregroundColor(.blue)
+                                    .foregroundColor(themeManager.accentColor)
                                 Text("Test Connection")
                                 Spacer()
                                 if syncService.isConnected {
@@ -702,6 +794,12 @@ struct SyncSettingsView: View {
 
                         syncService.serverURL = newURL
                         syncService.authToken = newToken
+                        
+                        // Ensure provider type is set to server
+                        if syncService.providerType != .server {
+                            syncService.providerType = .server
+                        }
+                        
                         dismiss()
                     }
                     .fontWeight(.semibold)
@@ -742,6 +840,13 @@ struct SyncSettingsView: View {
 
         Task {
             do {
+                // Ensure we are using the server provider
+                await MainActor.run {
+                    if syncService.providerType != .server {
+                        syncService.providerType = .server
+                    }
+                }
+
                 // Temporarily set the values for testing
                 syncService.serverURL = testURL
                 syncService.authToken = testToken

ios/SessionStatusLive/SessionStatusLiveBundle.swift

@@ -8,7 +8,6 @@ import WidgetKit
 struct SessionStatusLiveBundle: WidgetBundle {
     var body: some Widget {
         SessionStatusLive()
-        SessionStatusLiveControl()
         SessionStatusLiveLiveActivity()
     }
 }

ios/SessionStatusLive/SessionStatusLiveControl.swift

@@ -1,74 +0,0 @@
-//
-//  SessionStatusLiveControl.swift
-
-import AppIntents
-import SwiftUI
-import WidgetKit
-
-struct SessionStatusLiveControl: ControlWidget {
-    static let kind: String = "com.atridad.Ascently.SessionStatusLive"
-
-    var body: some ControlWidgetConfiguration {
-        AppIntentControlConfiguration(
-            kind: Self.kind,
-            provider: Provider()
-        ) { value in
-            ControlWidgetToggle(
-                "Start Timer",
-                isOn: value.isRunning,
-                action: StartTimerIntent(value.name)
-            ) { isRunning in
-                Label(isRunning ? "On" : "Off", systemImage: "timer")
-            }
-        }
-        .displayName("Timer")
-        .description("A an example control that runs a timer.")
-    }
-}
-
-extension SessionStatusLiveControl {
-    struct Value {
-        var isRunning: Bool
-        var name: String
-    }
-
-    struct Provider: AppIntentControlValueProvider {
-        func previewValue(configuration: TimerConfiguration) -> Value {
-            SessionStatusLiveControl.Value(isRunning: false, name: configuration.timerName)
-        }
-
-        func currentValue(configuration: TimerConfiguration) async throws -> Value {
-            let isRunning = true  // Check if the timer is running
-            return SessionStatusLiveControl.Value(
-                isRunning: isRunning, name: configuration.timerName)
-        }
-    }
-}
-
-struct TimerConfiguration: ControlConfigurationIntent {
-    static let title: LocalizedStringResource = "Timer Name Configuration"
-
-    @Parameter(title: "Timer Name", default: "Timer")
-    var timerName: String
-}
-
-struct StartTimerIntent: SetValueIntent {
-    static let title: LocalizedStringResource = "Start a timer"
-
-    @Parameter(title: "Timer Name")
-    var name: String
-
-    @Parameter(title: "Timer is running")
-    var value: Bool
-
-    init() {}
-
-    init(_ name: String) {
-        self.name = name
-    }
-
-    func perform() async throws -> some IntentResult {
-        // Start the timer…
-        return .result()
-    }
-}

sync/main.go

@@ -13,7 +13,7 @@ import (
 	"time"
 )
 
-const VERSION = "2.2.0"
+const VERSION = "2.3.0"
 
 func min(a, b int) int {
 	if a < b {