1.1.1 - More fixes for notification reliabilityyyyy

Reviewed-on: atridad/OpenClimb#2

.idea/caches/deviceStreaming.xml

@@ -817,6 +817,19 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2424" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="36" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="default" value="true" />
+          <option name="id" value="tokay" />
+          <option name="labId" value="google" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />

.idea/misc.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="temurin-21" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="temurin-21" project-jdk-type="JavaSDK" />
 </project>

app/build.gradle.kts

@@ -8,14 +8,14 @@ plugins {
 
 android {
     namespace = "com.atridad.openclimb"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.atridad.openclimb"
-        minSdk = 31
+        minSdk = 33
-        targetSdk = 35
+        targetSdk = 36
-        versionCode = 10
+        versionCode = 16
-        versionName = "0.4.3"
+        versionName = "1.1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -30,12 +30,19 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
+    
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
+    
     buildFeatures {
         compose = true
     }
@@ -74,13 +81,16 @@ dependencies {
     // Image Loading
     implementation(libs.coil.compose)
     
-    // Charts - Placeholder for future implementation
-    // Charts will be implemented with a stable library in future versions
-    
     // Testing
     testImplementation(libs.junit)
+    testImplementation(libs.mockk)
+    testImplementation(libs.kotlinx.coroutines.test)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(libs.androidx.test.core)
+    androidTestImplementation(libs.androidx.test.ext)
+    androidTestImplementation(libs.androidx.test.runner)
+    androidTestImplementation(libs.androidx.test.rules)
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)

app/src/main/AndroidManifest.xml

@@ -27,7 +27,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.OpenClimb">
+            android:theme="@style/Theme.OpenClimb.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -51,7 +51,8 @@
             android:name=".service.SessionTrackingService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="specialUse">
+            android:foregroundServiceType="specialUse"
+            android:description="@string/session_tracking_service_description">
             <meta-data
                 android:name="android.app.foreground_service_type"
                 android:value="specialUse" />

app/src/main/java/com/atridad/openclimb/MainActivity.kt

@@ -13,6 +13,7 @@ import com.atridad.openclimb.ui.theme.OpenClimbTheme
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setTheme(R.style.Theme_OpenClimb)
         enableEdgeToEdge()
         setContent {
             OpenClimbTheme {

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

@@ -53,6 +53,9 @@ interface AttemptDao {
     @Query("SELECT COUNT(*) FROM attempts")
     suspend fun getAttemptsCount(): Int
     
+    @Query("DELETE FROM attempts")
+    suspend fun deleteAllAttempts()
+    
     @Query("SELECT COUNT(*) FROM attempts WHERE sessionId = :sessionId")
     suspend fun getAttemptsCountBySession(sessionId: String): Int
     

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

@@ -59,6 +59,9 @@ interface ClimbSessionDao {
     @Query("SELECT * FROM climb_sessions WHERE status = 'ACTIVE' ORDER BY date DESC LIMIT 1")
     suspend fun getActiveSession(): ClimbSession?
     
+    @Query("DELETE FROM climb_sessions")
+    suspend fun deleteAllSessions()
+    
     @Query("SELECT * FROM climb_sessions WHERE status = 'ACTIVE' ORDER BY date DESC LIMIT 1")
     fun getActiveSessionFlow(): Flow<ClimbSession?>
 }

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

@@ -37,4 +37,7 @@ interface GymDao {
     
     @Query("SELECT * FROM gyms WHERE name LIKE '%' || :searchQuery || '%' OR location LIKE '%' || :searchQuery || '%'")
     fun searchGyms(searchQuery: String): Flow<List<Gym>>
+    
+    @Query("DELETE FROM gyms")
+    suspend fun deleteAllGyms()
 }

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

@@ -59,4 +59,10 @@ interface ProblemDao {
         ORDER BY updatedAt DESC
     """)
     fun searchProblems(searchQuery: String): Flow<List<Problem>>
+    
+    @Query("SELECT COUNT(*) FROM problems")
+    suspend fun getProblemsCount(): Int
+    
+    @Query("DELETE FROM problems")
+    suspend fun deleteAllProblems()
 }

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

@@ -64,181 +64,148 @@ class ClimbRepository(
     
 
     
-    // JSON Export
+    // ZIP Export with images - Single format for reliability
-    suspend fun exportAllDataToJson(directory: File? = null): File {
-        val exportDir = directory ?: File(context.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS), "OpenClimb")
-        if (!exportDir.exists()) {
-            exportDir.mkdirs()
-        }
-        
-        val timestamp = LocalDateTime.now().toString().replace(":", "-").replace(".", "-")
-        val exportFile = File(exportDir, "openclimb_export_$timestamp.json")
-        
-        val allGyms = gymDao.getAllGyms().first()
-        val allProblems = problemDao.getAllProblems().first()
-        val allSessions = sessionDao.getAllSessions().first()
-        val allAttempts = attemptDao.getAllAttempts().first()
-        
-        val exportData = ClimbDataExport(
-            exportedAt = LocalDateTime.now().toString(),
-            gyms = allGyms,
-            problems = allProblems,
-            sessions = allSessions,
-            attempts = allAttempts
-        )
-        
-        val jsonString = json.encodeToString(exportData)
-        exportFile.writeText(jsonString)
-        
-        return exportFile
-    }
-    
-    suspend fun exportAllDataToUri(context: Context, uri: android.net.Uri) {
-        val gyms = gymDao.getAllGyms().first()
-        val problems = problemDao.getAllProblems().first()
-        val sessions = sessionDao.getAllSessions().first()
-        val attempts = attemptDao.getAllAttempts().first()
-        
-        val exportData = ClimbDataExport(
-            exportedAt = LocalDateTime.now().toString(),
-            gyms = gyms,
-            problems = problems,
-            sessions = sessions,
-            attempts = attempts
-        )
-        
-        val jsonString = json.encodeToString(exportData)
-        
-        context.contentResolver.openOutputStream(uri)?.use { outputStream ->
-            outputStream.write(jsonString.toByteArray())
-        } ?: throw Exception("Could not open output stream")
-    }
-    
-    suspend fun importDataFromJson(file: File) {
-        try {
-            val jsonContent = file.readText()
-            val importData = json.decodeFromString<ClimbDataExport>(jsonContent)
-            
-            // Import gyms
-            importData.gyms.forEach { gym ->
-                try {
-                    gymDao.insertGym(gym)
-                } catch (_: Exception) {
-                    // If insertion fails, update instead
-                    gymDao.updateGym(gym)
-                }
-            }
-            
-            // Import problems
-            importData.problems.forEach { problem ->
-                try {
-                    problemDao.insertProblem(problem)
-                } catch (_: Exception) {
-                    problemDao.updateProblem(problem)
-                }
-            }
-            
-            // Import sessions
-            importData.sessions.forEach { session ->
-                try {
-                    sessionDao.insertSession(session)
-                } catch (_: Exception) {
-                    sessionDao.updateSession(session)
-                }
-            }
-            
-            // Import attempts
-            importData.attempts.forEach { attempt ->
-                try {
-                    attemptDao.insertAttempt(attempt)
-                } catch (_: Exception) {
-                    attemptDao.updateAttempt(attempt)
-                }
-            }
-            
-        } catch (e: Exception) {
-            throw Exception("Failed to import data: ${e.message}")
-        }
-    }
-    
-    // ZIP Export with images
     suspend fun exportAllDataToZip(directory: File? = null): File {
-        val allGyms = gymDao.getAllGyms().first()
+        try {
-        val allProblems = problemDao.getAllProblems().first()
+            // Collect all data with proper error handling
-        val allSessions = sessionDao.getAllSessions().first()
+            val allGyms = gymDao.getAllGyms().first()
-        val allAttempts = attemptDao.getAllAttempts().first()
+            val allProblems = problemDao.getAllProblems().first()
+            val allSessions = sessionDao.getAllSessions().first()
+            val allAttempts = attemptDao.getAllAttempts().first()
             
-        val exportData = ClimbDataExport(
+            // Validate data integrity before export
-            exportedAt = LocalDateTime.now().toString(),
+            validateDataIntegrity(allGyms, allProblems, allSessions, allAttempts)
-            gyms = allGyms,
-            problems = allProblems,
-            sessions = allSessions,
-            attempts = allAttempts
-        )
             
-        // Collect all referenced image paths
+            val exportData = ClimbDataExport(
-        val referencedImagePaths = allProblems.flatMap { it.imagePaths }.toSet()
+                exportedAt = LocalDateTime.now().toString(),
+                version = "1.0",
+                gyms = allGyms,
+                problems = allProblems,
+                sessions = allSessions,
+                attempts = allAttempts
+            )
             
-        return ZipExportImportUtils.createExportZip(
+            // Collect all referenced image paths and validate they exist
-            context = context,
+            val referencedImagePaths = allProblems.flatMap { it.imagePaths }.toSet()
-            exportData = exportData,
+            val validImagePaths = referencedImagePaths.filter { imagePath ->
-            referencedImagePaths = referencedImagePaths,
+                try {
-            directory = directory
+                    val imageFile = com.atridad.openclimb.utils.ImageUtils.getImageFile(context, imagePath)
-        )
+                    imageFile.exists() && imageFile.length() > 0
+                } catch (e: Exception) {
+                    false
+                }
+            }.toSet()
+            
+            // Log any missing images for debugging
+            val missingImages = referencedImagePaths - validImagePaths
+            if (missingImages.isNotEmpty()) {
+                android.util.Log.w("ClimbRepository", "Some referenced images are missing: $missingImages")
+            }
+            
+            return ZipExportImportUtils.createExportZip(
+                context = context,
+                exportData = exportData,
+                referencedImagePaths = validImagePaths,
+                directory = directory
+            )
+        } catch (e: Exception) {
+            throw Exception("Export failed: ${e.message}")
+        }
     }
     
     suspend fun exportAllDataToZipUri(context: Context, uri: android.net.Uri) {
-        val gyms = gymDao.getAllGyms().first()
+        try {
-        val problems = problemDao.getAllProblems().first()
+            // Collect all data with proper error handling
-        val sessions = sessionDao.getAllSessions().first()
+            val allGyms = gymDao.getAllGyms().first()
-        val attempts = attemptDao.getAllAttempts().first()
+            val allProblems = problemDao.getAllProblems().first()
+            val allSessions = sessionDao.getAllSessions().first()
+            val allAttempts = attemptDao.getAllAttempts().first()
             
-        val exportData = ClimbDataExport(
+            // Validate data integrity before export
-            exportedAt = LocalDateTime.now().toString(),
+            validateDataIntegrity(allGyms, allProblems, allSessions, allAttempts)
-            gyms = gyms,
-            problems = problems,
-            sessions = sessions,
-            attempts = attempts
-        )
             
-        // Collect all image paths
+            val exportData = ClimbDataExport(
-        val referencedImagePaths = problems.flatMap { it.imagePaths }.toSet()
+                exportedAt = LocalDateTime.now().toString(),
+                version = "1.0",
+                gyms = allGyms,
+                problems = allProblems,
+                sessions = allSessions,
+                attempts = allAttempts
+            )
             
-        ZipExportImportUtils.createExportZipToUri(
+            // Collect all referenced image paths and validate they exist
-            context = context,
+            val referencedImagePaths = allProblems.flatMap { it.imagePaths }.toSet()
-            uri = uri,
+            val validImagePaths = referencedImagePaths.filter { imagePath ->
-            exportData = exportData,
+                try {
-            referencedImagePaths = referencedImagePaths
+                    val imageFile = com.atridad.openclimb.utils.ImageUtils.getImageFile(context, imagePath)
-        )
+                    imageFile.exists() && imageFile.length() > 0
+                } catch (e: Exception) {
+                    false
+                }
+            }.toSet()
+            
+            ZipExportImportUtils.createExportZipToUri(
+                context = context,
+                uri = uri,
+                exportData = exportData,
+                referencedImagePaths = validImagePaths
+            )
+        } catch (e: Exception) {
+            throw Exception("Export failed: ${e.message}")
+        }
     }
     
     suspend fun importDataFromZip(file: File) {
         try {
-            val importResult = ZipExportImportUtils.extractImportZip(context, file)
+            // Validate the ZIP file
-            val importData = json.decodeFromString<ClimbDataExport>(importResult.jsonContent)
+            if (!file.exists() || file.length() == 0L) {
+                throw Exception("Invalid ZIP file: file is empty or doesn't exist")
+            }
             
-            // Update problem image paths with the new imported paths
+            // Extract and validate the ZIP contents
+            val importResult = ZipExportImportUtils.extractImportZip(context, file)
+            
+            // Validate JSON content
+            if (importResult.jsonContent.isBlank()) {
+                throw Exception("Invalid ZIP file: no data.json found or empty content")
+            }
+            
+            // Parse and validate the data structure
+            val importData = try {
+                json.decodeFromString<ClimbDataExport>(importResult.jsonContent)
+            } catch (e: Exception) {
+                throw Exception("Invalid data format: ${e.message}")
+            }
+            
+            // Validate data integrity
+            validateImportData(importData)
+            
+            // Clear existing data to avoid conflicts
+            attemptDao.deleteAllAttempts()
+            sessionDao.deleteAllSessions()
+            problemDao.deleteAllProblems()
+            gymDao.deleteAllGyms()
+            
+            // Import gyms first (problems depend on gyms)
+            importData.gyms.forEach { gym ->
+                try {
+                    gymDao.insertGym(gym)
+                } catch (e: Exception) {
+                    throw Exception("Failed to import gym ${gym.name}: ${e.message}")
+                }
+            }
+            
+            // Import problems with updated image paths
             val updatedProblems = ZipExportImportUtils.updateProblemImagePaths(
                 importData.problems,
                 importResult.importedImagePaths
             )
             
-            // Import gyms
-            importData.gyms.forEach { gym ->
-                try {
-                    gymDao.insertGym(gym)
-                } catch (e: Exception) {
-                    // If insertion fails update instead
-                    gymDao.updateGym(gym)
-                }
-            }
-            
-            // Import problems with updated image paths
             updatedProblems.forEach { problem ->
                 try {
                     problemDao.insertProblem(problem)
                 } catch (e: Exception) {
-                    problemDao.updateProblem(problem)
+                    throw Exception("Failed to import problem ${problem.name}: ${e.message}")
                 }
             }
             
@@ -247,21 +214,100 @@ class ClimbRepository(
                 try {
                     sessionDao.insertSession(session)
                 } catch (e: Exception) {
-                    sessionDao.updateSession(session)
+                    throw Exception("Failed to import session: ${e.message}")
                 }
             }
             
-            // Import attempts
+            // Import attempts last (depends on problems and sessions)
             importData.attempts.forEach { attempt ->
                 try {
                     attemptDao.insertAttempt(attempt)
                 } catch (e: Exception) {
-                    attemptDao.updateAttempt(attempt)
+                    throw Exception("Failed to import attempt: ${e.message}")
                 }
             }
             
         } catch (e: Exception) {
-            throw Exception("Failed to import data: ${e.message}")
+            throw Exception("Import failed: ${e.message}")
+        }
+    }
+    
+    private fun validateDataIntegrity(
+        gyms: List<Gym>,
+        problems: List<Problem>,
+        sessions: List<ClimbSession>,
+        attempts: List<Attempt>
+    ) {
+        // Validate that all problems reference valid gyms
+        val gymIds = gyms.map { it.id }.toSet()
+        val invalidProblems = problems.filter { it.gymId !in gymIds }
+        if (invalidProblems.isNotEmpty()) {
+            throw Exception("Data integrity error: ${invalidProblems.size} problems reference non-existent gyms")
+        }
+        
+        // Validate that all sessions reference valid gyms
+        val invalidSessions = sessions.filter { it.gymId !in gymIds }
+        if (invalidSessions.isNotEmpty()) {
+            throw Exception("Data integrity error: ${invalidSessions.size} sessions reference non-existent gyms")
+        }
+        
+        // Validate that all attempts reference valid problems and sessions
+        val problemIds = problems.map { it.id }.toSet()
+        val sessionIds = sessions.map { it.id }.toSet()
+        
+        val invalidAttempts = attempts.filter { 
+            it.problemId !in problemIds || it.sessionId !in sessionIds 
+        }
+        if (invalidAttempts.isNotEmpty()) {
+            throw Exception("Data integrity error: ${invalidAttempts.size} attempts reference non-existent problems or sessions")
+        }
+    }
+    
+    private fun validateImportData(importData: ClimbDataExport) {
+        if (importData.gyms.isEmpty()) {
+            throw Exception("Import data is invalid: no gyms found")
+        }
+        
+        if (importData.version.isBlank()) {
+            throw Exception("Import data is invalid: no version information")
+        }
+        
+        // Check for reasonable data sizes to prevent malicious imports
+        if (importData.gyms.size > 1000 || 
+            importData.problems.size > 10000 || 
+            importData.sessions.size > 10000 || 
+            importData.attempts.size > 100000) {
+            throw Exception("Import data is too large: possible corruption or malicious file")
+        }
+    }
+    
+    suspend fun resetAllData() {
+        try {
+            // Clear all data from database
+            attemptDao.deleteAllAttempts()
+            sessionDao.deleteAllSessions()
+            problemDao.deleteAllProblems()
+            gymDao.deleteAllGyms()
+            
+            // Clear all images from storage
+            clearAllImages()
+            
+        } catch (e: Exception) {
+            throw Exception("Reset failed: ${e.message}")
+        }
+    }
+    
+    private fun clearAllImages() {
+        try {
+            // Get the images directory
+            val imagesDir = File(context.filesDir, "images")
+            if (imagesDir.exists() && imagesDir.isDirectory) {
+                val deletedCount = imagesDir.listFiles()?.size ?: 0
+                imagesDir.deleteRecursively()
+                android.util.Log.i("ClimbRepository", "Cleared $deletedCount image files")
+            }
+        } catch (e: Exception) {
+            android.util.Log.w("ClimbRepository", "Failed to clear some images: ${e.message}")
         }
     }
 }
@@ -269,6 +315,7 @@ class ClimbRepository(
 @kotlinx.serialization.Serializable
 data class ClimbDataExport(
     val exportedAt: String,
+    val version: String = "1.0",
     val gyms: List<Gym>,
     val problems: List<Problem>,
     val sessions: List<ClimbSession>,

app/src/main/java/com/atridad/openclimb/service/SessionTrackingService.kt

@@ -16,13 +16,16 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.firstOrNull
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
+import kotlinx.coroutines.runBlocking
 
 class SessionTrackingService : Service() {
     
     private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private var notificationJob: Job? = null
+    private var monitoringJob: Job? = null
     
     private lateinit var repository: ClimbRepository
+    private lateinit var notificationManager: NotificationManager
     
     companion object {
         const val NOTIFICATION_ID = 1001
@@ -51,6 +54,7 @@ class SessionTrackingService : Service() {
         
         val database = OpenClimbDatabase.getDatabase(this)
         repository = ClimbRepository(database, this)
+        notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
         
         createNotificationChannel()
     }
@@ -81,41 +85,112 @@ class SessionTrackingService : Service() {
                 }
             }
         }
-        return START_STICKY
+
+        return START_REDELIVER_INTENT
+    }
+    
+    override fun onTaskRemoved(rootIntent: Intent?) {
+        super.onTaskRemoved(rootIntent)
     }
     
     override fun onBind(intent: Intent?): IBinder? = null
     
     private fun startSessionTracking(sessionId: String) {
         notificationJob?.cancel()
-        notificationJob = serviceScope.launch {
+        monitoringJob?.cancel()
-            // Initial notification update
-            updateNotification(sessionId)
         
-            // Then update every second
+        try {
-            while (isActive) {
+            createAndShowNotification(sessionId)
-                delay(1000L)
+        } catch (e: Exception) {
-                updateNotification(sessionId)
+            e.printStackTrace()
+        }
+        
+        notificationJob = serviceScope.launch {
+            try {
+                if (!isNotificationActive()) {
+                    delay(1000L)
+                    createAndShowNotification(sessionId)
+                }
+                
+                while (isActive) {
+                    delay(5000L)
+                    updateNotification(sessionId)
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+        
+        monitoringJob = serviceScope.launch {
+            try {
+                while (isActive) {
+                    delay(10000L)
+                    
+                    if (!isNotificationActive()) {
+                        updateNotification(sessionId)
+                    }
+                    
+                    val session = repository.getSessionById(sessionId)
+                    if (session == null || session.status != com.atridad.openclimb.data.model.SessionStatus.ACTIVE) {
+                        stopSessionTracking()
+                        break
+                    }
+                }
+            } catch (e: Exception) {
+                e.printStackTrace()
             }
         }
     }
     
     private fun stopSessionTracking() {
         notificationJob?.cancel()
+        monitoringJob?.cancel()
         stopForeground(STOP_FOREGROUND_REMOVE)
         stopSelf()
     }
     
+    private fun isNotificationActive(): Boolean {
+        return try {
+            val activeNotifications = notificationManager.activeNotifications
+            activeNotifications.any { it.id == NOTIFICATION_ID }
+        } catch (e: Exception) {
+            false
+        }
+    }
+    
     private suspend fun updateNotification(sessionId: String) {
         try {
-            val session = repository.getSessionById(sessionId)
+            createAndShowNotification(sessionId)
+        } catch (e: Exception) {
+            e.printStackTrace()
+
+            try {
+                delay(10000L)
+                createAndShowNotification(sessionId)
+            } catch (retryException: Exception) {
+                retryException.printStackTrace()
+                stopSessionTracking()
+            }
+        }
+    }
+    
+    private fun createAndShowNotification(sessionId: String) {
+        try {
+            val session = runBlocking {
+                repository.getSessionById(sessionId)
+            }
             if (session == null || session.status != com.atridad.openclimb.data.model.SessionStatus.ACTIVE) {
                 stopSessionTracking()
                 return
             }
             
-            val gym = repository.getGymById(session.gymId)
+            val gym = runBlocking {
-            val attempts = repository.getAttemptsBySession(sessionId).firstOrNull() ?: emptyList()
+                repository.getGymById(session.gymId)
+            }
+            
+            val attempts = runBlocking {
+                repository.getAttemptsBySession(sessionId).firstOrNull() ?: emptyList()
+            }
             
             val duration = session.startTime?.let { startTime ->
                 try {
@@ -141,7 +216,10 @@ class SessionTrackingService : Service() {
                 .setContentText("${gym?.name ?: "Gym"} • $duration • ${attempts.size} attempts")
                 .setSmallIcon(R.drawable.ic_mountains)
                 .setOngoing(true)
-                .setPriority(NotificationCompat.PRIORITY_LOW)
+                .setAutoCancel(false)
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setCategory(NotificationCompat.CATEGORY_SERVICE)
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setContentIntent(createOpenAppIntent())
                 .addAction(
                     R.drawable.ic_mountains,
@@ -155,20 +233,20 @@ class SessionTrackingService : Service() {
                 )
                 .build()
             
-            // Force update the notification every second
+            startForeground(NOTIFICATION_ID, notification)
-            val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+            
             notificationManager.notify(NOTIFICATION_ID, notification)
             
-            startForeground(NOTIFICATION_ID, notification)
+        } catch (e: Exception) {
-        } catch (_: Exception) {
+            e.printStackTrace()
-            // Handle errors gracefully
+            throw e
-            stopSessionTracking()
         }
     }
     
     private fun createOpenAppIntent(): PendingIntent {
         val intent = Intent(this, MainActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            action = "OPEN_SESSION"
         }
         return PendingIntent.getActivity(
             this,
@@ -192,19 +270,23 @@ class SessionTrackingService : Service() {
         val channel = NotificationChannel(
             CHANNEL_ID,
             "Session Tracking",
-            NotificationManager.IMPORTANCE_LOW
+            NotificationManager.IMPORTANCE_DEFAULT
         ).apply {
             description = "Shows active climbing session information"
             setShowBadge(false)
+            lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC
+            enableLights(false)
+            enableVibration(false)
+            setSound(null, null)
         }
 
-        val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
         notificationManager.createNotificationChannel(channel)
     }
     
     override fun onDestroy() {
         super.onDestroy()
         notificationJob?.cancel()
+        monitoringJob?.cancel()
         serviceScope.cancel()
     }
 }

app/src/main/java/com/atridad/openclimb/ui/OpenClimbApp.kt

@@ -1,8 +1,13 @@
 package com.atridad.openclimb.ui
 
+import android.Manifest
+import android.content.pm.PackageManager
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
@@ -18,9 +23,12 @@ import com.atridad.openclimb.data.database.OpenClimbDatabase
 import com.atridad.openclimb.data.repository.ClimbRepository
 import com.atridad.openclimb.navigation.Screen
 import com.atridad.openclimb.navigation.bottomNavigationItems
+import com.atridad.openclimb.ui.components.NotificationPermissionDialog
 import com.atridad.openclimb.ui.screens.*
+import com.atridad.openclimb.ui.theme.OpenClimbTheme
 import com.atridad.openclimb.ui.viewmodel.ClimbViewModel
 import com.atridad.openclimb.ui.viewmodel.ClimbViewModelFactory
+import com.atridad.openclimb.utils.NotificationPermissionUtils
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -34,6 +42,40 @@ fun OpenClimbApp() {
         factory = ClimbViewModelFactory(repository)
     )
     
+    // Notification permission state
+    var showNotificationPermissionDialog by remember { mutableStateOf(false) }
+    var hasCheckedNotificationPermission by remember { mutableStateOf(false) }
+    
+    // Permission launcher
+    val permissionLauncher = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.RequestPermission()
+    ) { isGranted: Boolean ->
+        // Handle permission result
+        if (isGranted) {
+            // Permission granted, continue
+        } else {
+            // Permission denied, show dialog again later
+            showNotificationPermissionDialog = false
+        }
+    }
+    
+    // Check notification permission on first launch
+    LaunchedEffect(Unit) {
+        if (!hasCheckedNotificationPermission) {
+            hasCheckedNotificationPermission = true
+            
+            if (NotificationPermissionUtils.shouldRequestNotificationPermission() &&
+                !NotificationPermissionUtils.isNotificationPermissionGranted(context)) {
+                showNotificationPermissionDialog = true
+            }
+        }
+    }
+    
+    // Ensure session tracking service is running when app resumes
+    LaunchedEffect(Unit) {
+        viewModel.ensureSessionTrackingServiceRunning(context)
+    }
+    
     // FAB configuration
     var fabConfig by remember { mutableStateOf<FabConfig?>(null) }
 
@@ -67,13 +109,19 @@ fun OpenClimbApp() {
                 LaunchedEffect(gyms, activeSession) {
                     fabConfig = if (gyms.isNotEmpty() && activeSession == null) {
                         FabConfig(
-                            icon = Icons.Default.Add,
+                            icon = Icons.Default.PlayArrow,
                             contentDescription = "Start Session",
                             onClick = { 
-                                if (gyms.size == 1) {
+                                // Check notification permission before starting session
-                                    viewModel.startSession(context, gyms.first().id)
+                                if (NotificationPermissionUtils.shouldRequestNotificationPermission() &&
+                                    !NotificationPermissionUtils.isNotificationPermissionGranted(context)) {
+                                    showNotificationPermissionDialog = true
                                 } else {
-                                    navController.navigate(Screen.AddEditSession())
+                                    if (gyms.size == 1) {
+                                        viewModel.startSession(context, gyms.first().id)
+                                    } else {
+                                        navController.navigate(Screen.AddEditSession())
+                                    }
                                 }
                             }
                         )
@@ -151,7 +199,10 @@ fun OpenClimbApp() {
                 SessionDetailScreen(
                     sessionId = args.sessionId,
                     viewModel = viewModel,
-                    onNavigateBack = { navController.popBackStack() }
+                    onNavigateBack = { navController.popBackStack() },
+                    onNavigateToProblemDetail = { problemId ->
+                        navController.navigate(Screen.ProblemDetail(problemId))
+                    }
                 )
             }
             
@@ -177,6 +228,12 @@ fun OpenClimbApp() {
                     onNavigateBack = { navController.popBackStack() },
                     onNavigateToEdit = { gymId ->
                         navController.navigate(Screen.AddEditGym(gymId = gymId))
+                    },
+                    onNavigateToSessionDetail = { sessionId ->
+                        navController.navigate(Screen.SessionDetail(sessionId))
+                    },
+                    onNavigateToProblemDetail = { problemId ->
+                        navController.navigate(Screen.ProblemDetail(problemId))
                     }
                 )
             }
@@ -214,6 +271,16 @@ fun OpenClimbApp() {
                 )
             }
         }
+        
+        // Notification permission dialog
+        if (showNotificationPermissionDialog) {
+            NotificationPermissionDialog(
+                onDismiss = { showNotificationPermissionDialog = false },
+                onRequestPermission = {
+                    permissionLauncher.launch(NotificationPermissionUtils.getNotificationPermissionString())
+                }
+            )
+        }
     }
 }
 

app/src/main/java/com/atridad/openclimb/ui/components/ActiveSessionBanner.kt

@@ -3,7 +3,6 @@ package com.atridad.openclimb.ui.components
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
@@ -13,9 +12,10 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import com.atridad.openclimb.data.model.ClimbSession
 import com.atridad.openclimb.data.model.Gym
+import com.atridad.openclimb.ui.theme.CustomIcons
+import kotlinx.coroutines.delay
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
-import kotlinx.coroutines.delay
 
 @Composable
 fun ActiveSessionBanner(
@@ -95,7 +95,7 @@ fun ActiveSessionBanner(
                     )
                 ) {
                     Icon(
-                        Icons.Default.Close,
+                        imageVector = CustomIcons.Stop(MaterialTheme.colorScheme.onError),
                         contentDescription = "End session"
                     )
                 }

app/src/main/java/com/atridad/openclimb/ui/components/NotificationPermissionDialog.kt

@@ -0,0 +1,89 @@
+package com.atridad.openclimb.ui.components
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Notifications
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+
+@Composable
+fun NotificationPermissionDialog(
+    onDismiss: () -> Unit,
+    onRequestPermission: () -> Unit
+) {
+    Dialog(
+        onDismissRequest = onDismiss,
+        properties = DialogProperties(
+            dismissOnBackPress = false,
+            dismissOnClickOutside = false
+        )
+    ) {
+        Card(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp),
+            shape = MaterialTheme.shapes.medium
+        ) {
+            Column(
+                modifier = Modifier.padding(24.dp),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Notifications,
+                    contentDescription = "Notifications",
+                    modifier = Modifier.size(48.dp),
+                    tint = MaterialTheme.colorScheme.primary
+                )
+                
+                Spacer(modifier = Modifier.height(16.dp))
+                
+                Text(
+                    text = "Enable Notifications",
+                    style = MaterialTheme.typography.headlineSmall,
+                    fontWeight = MaterialTheme.typography.headlineSmall.fontWeight,
+                    textAlign = TextAlign.Center
+                )
+                
+                Spacer(modifier = Modifier.height(12.dp))
+                
+                Text(
+                    text = "OpenClimb needs notification permission to show your active climbing session. This helps you track your progress and ensures the session doesn't get interrupted.",
+                    style = MaterialTheme.typography.bodyMedium,
+                    textAlign = TextAlign.Center,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+                
+                Spacer(modifier = Modifier.height(24.dp))
+                
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    TextButton(
+                        onClick = onDismiss,
+                        modifier = Modifier.weight(1f)
+                    ) {
+                        Text("Not Now")
+                    }
+                    
+                    Button(
+                        onClick = {
+                            onRequestPermission()
+                            onDismiss()
+                        },
+                        modifier = Modifier.weight(1f)
+                    ) {
+                        Text("Enable")
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -31,6 +31,7 @@ import androidx.lifecycle.viewModelScope
 import com.atridad.openclimb.data.model.*
 import com.atridad.openclimb.ui.components.FullscreenImageViewer
 import com.atridad.openclimb.ui.components.ImageDisplaySection
+import com.atridad.openclimb.ui.theme.CustomIcons
 import com.atridad.openclimb.ui.viewmodel.ClimbViewModel
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
@@ -209,7 +210,12 @@ fun EditAttemptDialog(
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SessionDetailScreen(sessionId: String, viewModel: ClimbViewModel, onNavigateBack: () -> Unit) {
+fun SessionDetailScreen(
+    sessionId: String, 
+    viewModel: ClimbViewModel, 
+    onNavigateBack: () -> Unit,
+    onNavigateToProblemDetail: (String) -> Unit = {}
+) {
     val context = LocalContext.current
     val attempts by viewModel.getAttemptsBySession(sessionId).collectAsState(initial = emptyList())
     val sessions by viewModel.sessions.collectAsState()
@@ -283,8 +289,23 @@ fun SessionDetailScreen(sessionId: String, viewModel: ClimbViewModel, onNavigate
                         }
                     }
 
-                    IconButton(onClick = { showDeleteDialog = true }) {
+                    // Show stop icon for active sessions, delete icon for completed sessions
-                        Icon(Icons.Default.Delete, contentDescription = "Delete")
+                    if (session?.status == SessionStatus.ACTIVE) {
+                        IconButton(onClick = { 
+                            session?.let { s ->
+                                viewModel.endSession(context, s.id)
+                                onNavigateBack()
+                            }
+                        }) {
+                            Icon(
+                                imageVector = CustomIcons.Stop(MaterialTheme.colorScheme.onSurface),
+                                contentDescription = "Stop Session"
+                            )
+                        }
+                    } else {
+                        IconButton(onClick = { showDeleteDialog = true }) {
+                            Icon(Icons.Default.Delete, contentDescription = "Delete")
+                        }
                     }
                 }
             )
@@ -412,49 +433,53 @@ fun SessionDetailScreen(sessionId: String, viewModel: ClimbViewModel, onNavigate
                                 
                             }
                             
-                            // Show grade range if available
+                            // Show grade range(s) with better layout
                             val grades = attemptedProblems.map { it.difficulty }
                             if (grades.isNotEmpty()) {
-                                // Separate boulder and rope problems
                                 val boulderProblems = attemptedProblems.filter { it.climbType == ClimbType.BOULDER }
                                 val ropeProblems = attemptedProblems.filter { it.climbType == ClimbType.ROPE }
 
-                                val gradeRange = when {
+                                val boulderRange = if (boulderProblems.isNotEmpty()) {
-                                    boulderProblems.isNotEmpty() && ropeProblems.isNotEmpty() -> {
+                                    val boulderGrades = boulderProblems.map { it.difficulty }
-                                        val boulderRange = if (boulderProblems.isNotEmpty()) {
+                                    val sorted = boulderGrades.sortedWith { a, b -> a.compareTo(b) }
-                                            val boulderGrades = boulderProblems.map { it.difficulty }
+                                    "${sorted.first().grade} - ${sorted.last().grade}"
-                                            val sortedBoulderGrades = boulderGrades.sortedWith { a, b -> a.compareTo(b) }
+                                } else null
-                                            "${sortedBoulderGrades.first().grade} - ${sortedBoulderGrades.last().grade}"
-                                        } else null
 
-                                        val ropeRange = if (ropeProblems.isNotEmpty()) {
+                                val ropeRange = if (ropeProblems.isNotEmpty()) {
-                                            val ropeGrades = ropeProblems.map { it.difficulty }
+                                    val ropeGrades = ropeProblems.map { it.difficulty }
-                                            val sortedRopeGrades = ropeGrades.sortedWith { a, b -> a.compareTo(b) }
+                                    val sorted = ropeGrades.sortedWith { a, b -> a.compareTo(b) }
-                                            "${sortedRopeGrades.first().grade} - ${sortedRopeGrades.last().grade}"
+                                    "${sorted.first().grade} - ${sorted.last().grade}"
-                                        } else null
+                                } else null
 
-                                        when {
+                                if (boulderRange != null && ropeRange != null) {
-                                            boulderRange != null && ropeRange != null -> "$boulderRange / $ropeRange"
+                                    Row(
-                                            boulderRange != null -> boulderRange
+                                        modifier = Modifier.fillMaxWidth(),
-                                            ropeRange != null -> ropeRange
+                                        horizontalArrangement = Arrangement.SpaceEvenly
-                                            else -> "N/A"
+                                    ) {
-                                        }
+                                        StatItem(label = "Boulder Range", value = boulderRange)
+                                        StatItem(label = "Rope Range", value = ropeRange)
                                     }
-                                    else -> {
+                                } else {
-                                        val sortedGrades = grades.sortedWith { a, b -> a.compareTo(b) }
+                                    Row(
-                                        "${sortedGrades.first().grade} - ${sortedGrades.last().grade}"
+                                        modifier = Modifier.fillMaxWidth(),
+                                        horizontalArrangement = Arrangement.Center
+                                    ) {
+                                        StatItem(
+                                            label = "Grade Range",
+                                            value = boulderRange ?: ropeRange ?: "N/A"
+                                        )
                                     }
                                 }
-                                
-                                StatItem(
-                                    label = "Grade Range",
-                                    value = gradeRange
-                                )
                             } else {
-                                StatItem(
+                                Row(
-                                    label = "Grade Range",
+                                    modifier = Modifier.fillMaxWidth(),
-                                    value = "N/A"
+                                    horizontalArrangement = Arrangement.Center
-                                )
+                                ) {
+                                    StatItem(
+                                        label = "Grade Range",
+                                        value = "N/A"
+                                    )
+                                }
                             }
                         }
                     }
@@ -500,7 +525,8 @@ fun SessionDetailScreen(sessionId: String, viewModel: ClimbViewModel, onNavigate
                         onEditAttempt = { attemptToEdit -> showEditAttemptDialog = attemptToEdit },
                         onDeleteAttempt = { attemptToDelete ->
                             viewModel.deleteAttempt(attemptToDelete)
-                        }
+                        },
+                        onAttemptClick = { onNavigateToProblemDetail(problem.id) }
                     )
                 }
             }
@@ -884,7 +910,9 @@ fun GymDetailScreen(
     gymId: String,
     viewModel: ClimbViewModel,
     onNavigateBack: () -> Unit,
-    onNavigateToEdit: (String) -> Unit
+    onNavigateToEdit: (String) -> Unit,
+    onNavigateToSessionDetail: (String) -> Unit = {},
+    onNavigateToProblemDetail: (String) -> Unit = {}
 ) {
     val gyms by viewModel.gyms.collectAsState()
     val gym = gyms.find { it.id == gymId }
@@ -1115,14 +1143,16 @@ fun GymDetailScreen(
 
                                         Card(
                                             modifier =
-                                                Modifier.fillMaxWidth().padding(vertical = 4.dp),
+                                                Modifier
+                                                    .fillMaxWidth()
+                                                    .padding(vertical = 4.dp)
+                                                    .clickable { onNavigateToProblemDetail(problem.id) },
                                             colors =
                                                 CardDefaults.cardColors(
-                                                    containerColor =
+                                                    containerColor = MaterialTheme.colorScheme.surface
-                                                        MaterialTheme.colorScheme.surfaceVariant
-                                                            .copy(alpha = 0.3f)
                                                 ),
-                                            shape = RoundedCornerShape(12.dp)
+                                            shape = RoundedCornerShape(12.dp),
+                                            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
                                         ) {
                                             ListItem(
                                                 headlineContent = {
@@ -1188,14 +1218,16 @@ fun GymDetailScreen(
 
                                         Card(
                                             modifier =
-                                                Modifier.fillMaxWidth().padding(vertical = 4.dp),
+                                                Modifier
+                                                    .fillMaxWidth()
+                                                    .padding(vertical = 4.dp)
+                                                    .clickable { onNavigateToSessionDetail(session.id) },
                                             colors =
                                                 CardDefaults.cardColors(
-                                                    containerColor =
+                                                    containerColor = MaterialTheme.colorScheme.surface
-                                                        MaterialTheme.colorScheme.surfaceVariant
-                                                            .copy(alpha = 0.3f)
                                                 ),
-                                            shape = RoundedCornerShape(12.dp)
+                                            shape = RoundedCornerShape(12.dp),
+                                            elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
                                         ) {
                                             ListItem(
                                                 headlineContent = {
@@ -1436,11 +1468,17 @@ fun SessionAttemptCard(
     attempt: Attempt,
     problem: Problem,
     onEditAttempt: (Attempt) -> Unit = {},
-    onDeleteAttempt: (Attempt) -> Unit = {}
+    onDeleteAttempt: (Attempt) -> Unit = {},
+    onAttemptClick: () -> Unit = {}
 ) {
     var showDeleteDialog by remember { mutableStateOf(false) }
 
-    Card(modifier = Modifier.fillMaxWidth()) {
+    Card(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onAttemptClick() },
+        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
+    ) {
         Column(modifier = Modifier.padding(16.dp)) {
             Row(
                 modifier = Modifier.fillMaxWidth(),
@@ -1491,11 +1529,7 @@ fun SessionAttemptCard(
                     // Delete button
                     IconButton(
                         onClick = { showDeleteDialog = true },
-                        modifier = Modifier.size(32.dp),
+                        modifier = Modifier.size(32.dp)
-                        colors =
-                            IconButtonDefaults.iconButtonColors(
-                                contentColor = MaterialTheme.colorScheme.error
-                            )
                     ) {
                         Icon(
                             Icons.Default.Delete,

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

@@ -26,12 +26,16 @@ fun SettingsScreen(
 ) {
     val uiState by viewModel.uiState.collectAsState()
     val context = LocalContext.current
+    
+    // State for reset confirmation dialog
+    var showResetDialog by remember { mutableStateOf(false) }
+    
     val packageInfo = remember {
         context.packageManager.getPackageInfo(context.packageName, 0)
     }
     val appVersion = packageInfo.versionName
     
-    // File picker launcher for import - accepts both ZIP and JSON files
+    // File picker launcher for import - only accepts ZIP files
     val importLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.GetContent()
     ) { uri ->
@@ -46,9 +50,13 @@ fun SettingsScreen(
                     } else null
                 } ?: "import_file"
                 
-                val extension = fileName.substringAfterLast(".", "")
+                // Only allow ZIP files
-                val tempFileName = if (extension.isNotEmpty()) "temp_import.$extension" else "temp_import"
+                if (!fileName.lowercase().endsWith(".zip")) {
-                val tempFile = File(context.cacheDir, tempFileName)
+                    viewModel.setError("Only ZIP files are supported for import. Please use a ZIP file exported from OpenClimb.")
+                    return@let
+                }
+                
+                val tempFile = File(context.cacheDir, "temp_import.zip")
                 
                 inputStream?.use { input ->
                     tempFile.outputStream().use { output ->
@@ -62,7 +70,7 @@ fun SettingsScreen(
         }
     }
     
-    // File picker launcher for export - save location (ZIP format with images)
+    // File picker launcher for export - ZIP format with images
     val exportZipLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.CreateDocument("application/zip")
     ) { uri ->
@@ -75,19 +83,6 @@ fun SettingsScreen(
         }
     }
     
-    // JSON export launcher
-    val exportJsonLauncher = rememberLauncherForActivityResult(
-        contract = ActivityResultContracts.CreateDocument("application/json")
-    ) { uri ->
-        uri?.let {
-            try {
-                viewModel.exportDataToUri(context, uri)
-            } catch (e: Exception) {
-                viewModel.setError("Failed to save file: ${e.message}")
-            }
-        }
-    }
-    
     LazyColumn(
         modifier = Modifier
             .fillMaxSize()
@@ -179,19 +174,13 @@ fun SettingsScreen(
                         )
                     ) {
                         ListItem(
-                            headlineContent = { Text("Export Data Only") },
+                            headlineContent = { Text("Import Data") },
-                            supportingContent = { Text("Export climbing data to JSON without images") },
+                            supportingContent = { Text("Import climbing data from ZIP file (recommended format)") },
-                            leadingContent = { Icon(Icons.Default.Share, contentDescription = null) },
+                            leadingContent = { Icon(Icons.Default.Add, contentDescription = null) },
                             trailingContent = {
                                 TextButton(
                                     onClick = { 
-                                        val defaultFileName = "openclimb_export_${
+                                        importLauncher.launch("application/zip")
-                                            java.time.LocalDateTime.now()
-                                                .toString()
-                                                .replace(":", "-")
-                                                .replace(".", "-")
-                                        }.json"
-                                        exportJsonLauncher.launch(defaultFileName)
                                     },
                                     enabled = !uiState.isLoading
                                 ) {
@@ -201,7 +190,7 @@ fun SettingsScreen(
                                             strokeWidth = 2.dp
                                         )
                                     } else {
-                                        Text("Export JSON")
+                                        Text("Import")
                                     }
                                 }
                             }
@@ -213,17 +202,17 @@ fun SettingsScreen(
                     Card(
                         shape = RoundedCornerShape(12.dp),
                         colors = CardDefaults.cardColors(
-                            containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
+                            containerColor = MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.3f)
                         )
                     ) {
                         ListItem(
-                            headlineContent = { Text("Import Data") },
+                            headlineContent = { Text("Reset All Data") },
-                            supportingContent = { Text("Import climbing data from ZIP or JSON file") },
+                            supportingContent = { Text("Permanently delete all gyms, problems, sessions, attempts, and images") },
-                            leadingContent = { Icon(Icons.Default.Add, contentDescription = null) },
+                            leadingContent = { Icon(Icons.Default.Delete, contentDescription = null, tint = MaterialTheme.colorScheme.error) },
                             trailingContent = {
                                 TextButton(
                                     onClick = { 
-                                        importLauncher.launch("*/*")
+                                        showResetDialog = true
                                     },
                                     enabled = !uiState.isLoading
                                 ) {
@@ -233,7 +222,7 @@ fun SettingsScreen(
                                             strokeWidth = 2.dp
                                         )
                                     } else {
-                                        Text("Import")
+                                        Text("Reset", color = MaterialTheme.colorScheme.error)
                                     }
                                 }
                             }
@@ -390,4 +379,51 @@ fun SettingsScreen(
             }
         }
     }
+    
+    // Reset confirmation dialog
+    if (showResetDialog) {
+        AlertDialog(
+            onDismissRequest = { showResetDialog = false },
+            title = { Text("Reset All Data") },
+            text = {
+                Column {
+                    Text("Are you sure you want to reset all data?")
+                    Spacer(modifier = Modifier.height(8.dp))
+                    Text(
+                        text = "This will permanently delete:",
+                        style = MaterialTheme.typography.bodySmall,
+                        fontWeight = FontWeight.Medium
+                    )
+                    Spacer(modifier = Modifier.height(4.dp))
+                    Text(
+                        text = "• All gyms and their information\n• All problems and their images\n• All climbing sessions\n• All attempts and progress data",
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.error
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+                    Text(
+                        text = "This action cannot be undone. Consider exporting your data first.",
+                        style = MaterialTheme.typography.bodySmall,
+                        fontWeight = FontWeight.Medium,
+                        color = MaterialTheme.colorScheme.error
+                    )
+                }
+            },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        viewModel.resetAllData()
+                        showResetDialog = false
+                    }
+                ) {
+                    Text("Reset All Data", color = MaterialTheme.colorScheme.error)
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { showResetDialog = false }) { 
+                    Text("Cancel") 
+                }
+            }
+        )
+    }
 }

app/src/main/java/com/atridad/openclimb/ui/theme/CustomIcons.kt

@@ -0,0 +1,25 @@
+package com.atridad.openclimb.ui.theme
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.path
+import androidx.compose.ui.unit.dp
+
+object CustomIcons {
+    fun Stop(color: Color = Color.Black): ImageVector = ImageVector.Builder(
+        name = "Stop",
+        defaultWidth = 24.dp,
+        defaultHeight = 24.dp,
+        viewportWidth = 24f,
+        viewportHeight = 24f
+    ).path(
+        fill = SolidColor(color)
+    ) {
+        moveTo(6f, 6f)
+        horizontalLineTo(18f)
+        verticalLineTo(18f)
+        horizontalLineTo(6f)
+        close()
+    }.build()
+}

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

@@ -147,6 +147,14 @@ class ClimbViewModel(
     // Active session management
     fun startSession(context: Context, gymId: String, notes: String? = null) {
         viewModelScope.launch {
+            // Check notification permission first
+            if (!com.atridad.openclimb.utils.NotificationPermissionUtils.isNotificationPermissionGranted(context)) {
+                _uiState.value = _uiState.value.copy(
+                    error = "Notification permission is required to track your climbing session. Please enable notifications in settings."
+                )
+                return@launch
+            }
+            
             val existingActive = repository.getActiveSession()
             if (existingActive != null) {
                 _uiState.value = _uiState.value.copy(
@@ -170,6 +178,14 @@ class ClimbViewModel(
     
     fun endSession(context: Context, sessionId: String) {
         viewModelScope.launch {
+            // Check notification permission first
+            if (!com.atridad.openclimb.utils.NotificationPermissionUtils.isNotificationPermissionGranted(context)) {
+                _uiState.value = _uiState.value.copy(
+                    error = "Notification permission is required to manage your climbing session. Please enable notifications in settings."
+                )
+                return@launch
+            }
+            
             val session = repository.getSessionById(sessionId)
             if (session != null && session.status == SessionStatus.ACTIVE) {
                 val completedSession = with(ClimbSession) { session.complete() }
@@ -186,6 +202,21 @@ class ClimbViewModel(
         }
     }
     
+    /**
+     * Check if the session tracking service is running and restart it if needed
+     */
+    fun ensureSessionTrackingServiceRunning(context: Context) {
+        viewModelScope.launch {
+            val activeSession = repository.getActiveSession()
+            if (activeSession != null && activeSession.status == SessionStatus.ACTIVE) {
+                // Check if service is running by trying to start it again
+                // The service will handle duplicate starts gracefully
+                val serviceIntent = SessionTrackingService.createStartIntent(context, activeSession.id)
+                context.startForegroundService(serviceIntent)
+            }
+        }
+    }
+    
     // Attempt operations
     fun addAttempt(attempt: Attempt) {
         viewModelScope.launch {
@@ -211,23 +242,7 @@ class ClimbViewModel(
     fun getAttemptsByProblem(problemId: String): Flow<List<Attempt>> = 
         repository.getAttemptsByProblem(problemId)
 
-    fun exportDataToUri(context: Context, uri: android.net.Uri) {
+
-        viewModelScope.launch {
-            try {
-                _uiState.value = _uiState.value.copy(isLoading = true)
-                repository.exportAllDataToUri(context, uri)
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    message = "Data exported successfully"
-                )
-            } catch (e: Exception) {
-                _uiState.value = _uiState.value.copy(
-                    isLoading = false,
-                    error = "Export failed: ${e.message}"
-                )
-            }
-        }
-    }
 
     fun exportDataToZipUri(context: Context, uri: android.net.Uri) {
         viewModelScope.launch {
@@ -252,13 +267,13 @@ class ClimbViewModel(
             try {
                 _uiState.value = _uiState.value.copy(isLoading = true)
                 
-                // Check if it's a ZIP file or JSON file
+                // Only support ZIP format for reliability
-                if (file.name.lowercase().endsWith(".zip")) {
+                if (!file.name.lowercase().endsWith(".zip")) {
-                    repository.importDataFromZip(file)
+                    throw Exception("Only ZIP files are supported for import. Please use a ZIP file exported from OpenClimb.")
-                } else {
-                    repository.importDataFromJson(file)
                 }
                 
+                repository.importDataFromZip(file)
+                
                 _uiState.value = _uiState.value.copy(
                     isLoading = false,
                     message = "Data imported successfully from ${file.name}"
@@ -285,6 +300,26 @@ class ClimbViewModel(
         _uiState.value = _uiState.value.copy(error = message)
     }
     
+    fun resetAllData() {
+        viewModelScope.launch {
+            try {
+                _uiState.value = _uiState.value.copy(isLoading = true)
+                
+                repository.resetAllData()
+                
+                _uiState.value = _uiState.value.copy(
+                    isLoading = false,
+                    message = "All data has been reset successfully"
+                )
+            } catch (e: Exception) {
+                _uiState.value = _uiState.value.copy(
+                    isLoading = false,
+                    error = "Reset failed: ${e.message}"
+                )
+            }
+        }
+    }
+    
     // Share operations
     suspend fun generateSessionShareCard(
         context: Context,

app/src/main/java/com/atridad/openclimb/utils/NotificationPermissionUtils.kt

@@ -0,0 +1,33 @@
+package com.atridad.openclimb.utils
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import androidx.core.content.ContextCompat
+
+object NotificationPermissionUtils {
+    
+    /**
+     * Check if notification permission is granted
+     */
+    fun isNotificationPermissionGranted(context: Context): Boolean {
+        return ContextCompat.checkSelfPermission(
+            context,
+            Manifest.permission.POST_NOTIFICATIONS
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+    
+    /**
+     * Check if notification permission should be requested
+     */
+    fun shouldRequestNotificationPermission(): Boolean {
+        return true
+    }
+    
+    /**
+     * Get the notification permission string
+     */
+    fun getNotificationPermissionString(): String {
+        return Manifest.permission.POST_NOTIFICATIONS
+    }
+}

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

@@ -172,8 +172,8 @@ object SessionShareUtils {
         stats: SessionStats
     ): File? {
         return try {
-            val width = 1080
+            val width = 1242 // 3:4 aspect at higher resolution for better fit
-            val height = 1350
+            val height = 1656
             
             val bitmap = createBitmap(width, height)
             val canvas = Canvas(bitmap)
@@ -227,7 +227,7 @@ object SessionShareUtils {
             }
             
             // Draw main card background
-            val cardRect = RectF(60f, 200f, width - 60f, height - 100f)
+            val cardRect = RectF(60f, 200f, width - 60f, height - 120f)
             canvas.drawRoundRect(cardRect, 40f, 40f, cardPaint)
             
             // Draw content
@@ -248,31 +248,48 @@ object SessionShareUtils {
             // Stats grid
             val statsStartY = yPosition
             val columnWidth = width / 2f
+            val columnMaxTextWidth = columnWidth - 120f
             
             // Left column stats
             var leftY = statsStartY
-            drawStatItem(canvas, columnWidth / 2f, leftY, "Attempts", stats.totalAttempts.toString(), statLabelPaint, statValuePaint)
+            drawStatItemFitting(canvas, columnWidth / 2f, leftY, "Attempts", stats.totalAttempts.toString(), statLabelPaint, statValuePaint, columnMaxTextWidth)
-            leftY += 140f
+            leftY += 120f
-            drawStatItem(canvas, columnWidth / 2f, leftY, "Problems", stats.uniqueProblemsAttempted.toString(), statLabelPaint, statValuePaint)
+            drawStatItemFitting(canvas, columnWidth / 2f, leftY, "Problems", stats.uniqueProblemsAttempted.toString(), statLabelPaint, statValuePaint, columnMaxTextWidth)
-            leftY += 140f
+            leftY += 120f
-            drawStatItem(canvas, columnWidth / 2f, leftY, "Duration", stats.sessionDuration, statLabelPaint, statValuePaint)
+            drawStatItemFitting(canvas, columnWidth / 2f, leftY, "Duration", stats.sessionDuration, statLabelPaint, statValuePaint, columnMaxTextWidth)
             
             // Right column stats
             var rightY = statsStartY
-            drawStatItem(canvas, width - columnWidth / 2f, rightY, "Successful", stats.successfulAttempts.toString(), statLabelPaint, statValuePaint)
+            drawStatItemFitting(canvas, width - columnWidth / 2f, rightY, "Successful", stats.successfulAttempts.toString(), statLabelPaint, statValuePaint, columnMaxTextWidth)
-            rightY += 140f
+            rightY += 120f
-            drawStatItem(canvas, width - columnWidth / 2f, rightY, "Completed", stats.uniqueProblemsCompleted.toString(), statLabelPaint, statValuePaint)
+            drawStatItemFitting(canvas, width - columnWidth / 2f, rightY, "Completed", stats.uniqueProblemsCompleted.toString(), statLabelPaint, statValuePaint, columnMaxTextWidth)
-            rightY += 140f
+            rightY += 120f
             
+            var rightYAfter = rightY
             stats.topGrade?.let { grade ->
-                drawStatItem(canvas, width - columnWidth / 2f, rightY, "Top Grade", grade, statLabelPaint, statValuePaint)
+                drawStatItemFitting(canvas, width - columnWidth / 2f, rightY, "Top Grade", grade, statLabelPaint, statValuePaint, columnMaxTextWidth)
+                rightYAfter += 120f
+            }
+            
+            // Grade range(s)
+            val boulderRange = gradeRangeForProblems(stats.problems.filter { it.climbType == ClimbType.BOULDER })
+            val ropeRange = gradeRangeForProblems(stats.problems.filter { it.climbType == ClimbType.ROPE })
+            val rangesY = kotlin.math.max(leftY, rightYAfter) + 120f
+            if (boulderRange != null && ropeRange != null) {
+                // Two evenly spaced items
+                drawStatItemFitting(canvas, columnWidth / 2f, rangesY, "Boulder Range", boulderRange, statLabelPaint, statValuePaint, columnMaxTextWidth)
+                drawStatItemFitting(canvas, width - columnWidth / 2f, rangesY, "Rope Range", ropeRange, statLabelPaint, statValuePaint, columnMaxTextWidth)
+            } else if (boulderRange != null || ropeRange != null) {
+                // Single centered item
+                val singleRange = boulderRange ?: ropeRange ?: ""
+                drawStatItemFitting(canvas, width / 2f, rangesY, "Grade Range", singleRange, statLabelPaint, statValuePaint, width - 200f)
             }
             
             // Success rate arc
-            if (stats.totalAttempts > 0) {
+            val successRate = if (stats.totalAttempts > 0) {
-                val successRate = (stats.successfulAttempts.toFloat() / stats.totalAttempts) * 100
+                (stats.successfulAttempts.toFloat() / stats.totalAttempts) * 100f
-                drawSuccessRateArc(canvas, width / 2f, height - 280f, successRate, statLabelPaint, statValuePaint)
+            } else 0f
-            }
+            drawSuccessRateArc(canvas, width / 2f, height - 300f, successRate, statLabelPaint, statValuePaint)
             
             // App branding
             val brandingPaint = Paint().apply {
@@ -320,6 +337,41 @@ object SessionShareUtils {
         canvas.drawText(label, x, y + 50f, labelPaint)
     }
     
+    /**
+     * Draws a stat item while fitting the value text to a max width by reducing text size if needed.
+     */
+    private fun drawStatItemFitting(
+        canvas: Canvas,
+        x: Float,
+        y: Float,
+        label: String,
+        value: String,
+        labelPaint: Paint,
+        valuePaint: Paint,
+        maxTextWidth: Float
+    ) {
+        val tempPaint = Paint(valuePaint)
+        var textSize = tempPaint.textSize
+        var textWidth = tempPaint.measureText(value)
+        while (textWidth > maxTextWidth && textSize > 36f) {
+            textSize -= 2f
+            tempPaint.textSize = textSize
+            textWidth = tempPaint.measureText(value)
+        }
+        canvas.drawText(value, x, y, tempPaint)
+        canvas.drawText(label, x, y + 50f, labelPaint)
+    }
+    
+    /**
+     * Returns a range string like "X - Y" for the given problems, based on their difficulty grades.
+     */
+    private fun gradeRangeForProblems(problems: List<Problem>): String? {
+        if (problems.isEmpty()) return null
+        val grades = problems.map { it.difficulty }
+        val sorted = grades.sortedWith { a, b -> a.compareTo(b) }
+        return "${sorted.first().grade} - ${sorted.last().grade}"
+    }
+    
     private fun drawSuccessRateArc(
         canvas: Canvas,
         centerX: Float,
@@ -328,12 +380,12 @@ object SessionShareUtils {
         labelPaint: Paint,
         valuePaint: Paint
     ) {
-        val radius = 80f
+        val radius = 70f
-        val strokeWidth = 16f
+        val strokeWidth = 14f
 
         // Background arc
         val bgPaint = Paint().apply {
-            color = "#40FFFFFF".toColorInt()
+            color = "#30FFFFFF".toColorInt()
             style = Paint.Style.STROKE
             this.strokeWidth = strokeWidth
             isAntiAlias = true
@@ -360,8 +412,11 @@ object SessionShareUtils {
 
         // Draw percentage text
         val percentText = "${successRate.roundToInt()}%"
-        canvas.drawText(percentText, centerX, centerY + 10f, valuePaint)
+        canvas.drawText(percentText, centerX, centerY + 8f, valuePaint)
-        canvas.drawText("Success Rate", centerX, centerY + 60f, labelPaint)
+
+        // Draw label below the arc (outside the ring) for better readability
+        val belowLabelPaint = Paint(labelPaint)
+        canvas.drawText("Success Rate", centerX, centerY + radius + 36f, belowLabelPaint)
     }
     
     private fun formatSessionDate(dateString: String): String {

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

@@ -15,6 +15,7 @@ object ZipExportImportUtils {
     
     private const val DATA_JSON_FILENAME = "data.json"
     private const val IMAGES_DIR_NAME = "images"
+    private const val METADATA_FILENAME = "metadata.txt"
     
     /**
      * Creates a ZIP file containing the JSON data and all referenced images
@@ -38,37 +39,67 @@ object ZipExportImportUtils {
         val timestamp = LocalDateTime.now().toString().replace(":", "-").replace(".", "-")
         val zipFile = File(exportDir, "openclimb_export_$timestamp.zip")
         
-        ZipOutputStream(FileOutputStream(zipFile)).use { zipOut ->
+        try {
-            // Add JSON data file
+            ZipOutputStream(FileOutputStream(zipFile)).use { zipOut ->
-            val json = Json { prettyPrint = true }
+                // Add metadata file first
-            val jsonString = json.encodeToString(com.atridad.openclimb.data.repository.ClimbDataExport.serializer(), exportData)
+                val metadata = createMetadata(exportData, referencedImagePaths)
+                val metadataEntry = ZipEntry(METADATA_FILENAME)
+                zipOut.putNextEntry(metadataEntry)
+                zipOut.write(metadata.toByteArray())
+                zipOut.closeEntry()
                 
-            val jsonEntry = ZipEntry(DATA_JSON_FILENAME)
+                // Add JSON data file
-            zipOut.putNextEntry(jsonEntry)
+                val json = Json { 
-            zipOut.write(jsonString.toByteArray())
+                    prettyPrint = true 
-            zipOut.closeEntry()
+                    ignoreUnknownKeys = true
-            
-            // Add images
-            referencedImagePaths.forEach { imagePath ->
-                try {
-                    val imageFile = ImageUtils.getImageFile(context, imagePath)
-                    if (imageFile.exists()) {
-                        val imageEntry = ZipEntry("$IMAGES_DIR_NAME/${imageFile.name}")
-                        zipOut.putNextEntry(imageEntry)
-                        
-                        FileInputStream(imageFile).use { imageInput ->
-                            imageInput.copyTo(zipOut)
-                        }
-                        zipOut.closeEntry()
-                    }
-                } catch (e: Exception) {
-                    // Log error but continue with other images
-                    e.printStackTrace()
                 }
-            }
+                val jsonString = json.encodeToString(com.atridad.openclimb.data.repository.ClimbDataExport.serializer(), exportData)
-        }
                 
-        return zipFile
+                val jsonEntry = ZipEntry(DATA_JSON_FILENAME)
+                zipOut.putNextEntry(jsonEntry)
+                zipOut.write(jsonString.toByteArray())
+                zipOut.closeEntry()
+                
+                // Add images with validation
+                var successfulImages = 0
+                referencedImagePaths.forEach { imagePath ->
+                    try {
+                        val imageFile = ImageUtils.getImageFile(context, imagePath)
+                        if (imageFile.exists() && imageFile.length() > 0) {
+                            val imageEntry = ZipEntry("$IMAGES_DIR_NAME/${imageFile.name}")
+                            zipOut.putNextEntry(imageEntry)
+                            
+                            FileInputStream(imageFile).use { imageInput ->
+                                imageInput.copyTo(zipOut)
+                            }
+                            zipOut.closeEntry()
+                            successfulImages++
+                        } else {
+                            android.util.Log.w("ZipExportImportUtils", "Image file not found or empty: $imagePath")
+                        }
+                    } catch (e: Exception) {
+                        android.util.Log.e("ZipExportImportUtils", "Failed to add image $imagePath: ${e.message}")
+                    }
+                }
+                
+                // Log export summary
+                android.util.Log.i("ZipExportImportUtils", "Export completed: ${successfulImages}/${referencedImagePaths.size} images included")
+            }
+            
+            // Validate the created ZIP file
+            if (!zipFile.exists() || zipFile.length() == 0L) {
+                throw IOException("Failed to create ZIP file: file is empty or doesn't exist")
+            }
+            
+            return zipFile
+            
+        } catch (e: Exception) {
+            // Clean up failed export
+            if (zipFile.exists()) {
+                zipFile.delete()
+            }
+            throw IOException("Failed to create export ZIP: ${e.message}")
+        }
     }
     
     /**
@@ -84,37 +115,73 @@ object ZipExportImportUtils {
         exportData: com.atridad.openclimb.data.repository.ClimbDataExport,
         referencedImagePaths: Set<String>
     ) {
-        context.contentResolver.openOutputStream(uri)?.use { outputStream ->
+        try {
-            ZipOutputStream(outputStream).use { zipOut ->
+            context.contentResolver.openOutputStream(uri)?.use { outputStream ->
-                // Add JSON data file
+                ZipOutputStream(outputStream).use { zipOut ->
-                val json = Json { prettyPrint = true }
+                    // Add metadata file first
-                val jsonString = json.encodeToString(com.atridad.openclimb.data.repository.ClimbDataExport.serializer(), exportData)
+                    val metadata = createMetadata(exportData, referencedImagePaths)
+                    val metadataEntry = ZipEntry(METADATA_FILENAME)
+                    zipOut.putNextEntry(metadataEntry)
+                    zipOut.write(metadata.toByteArray())
+                    zipOut.closeEntry()
                     
-                val jsonEntry = ZipEntry(DATA_JSON_FILENAME)
+                    // Add JSON data file
-                zipOut.putNextEntry(jsonEntry)
+                    val json = Json { 
-                zipOut.write(jsonString.toByteArray())
+                        prettyPrint = true 
-                zipOut.closeEntry()
+                        ignoreUnknownKeys = true
-                
-                // Add images
-                referencedImagePaths.forEach { imagePath ->
-                    try {
-                        val imageFile = ImageUtils.getImageFile(context, imagePath)
-                        if (imageFile.exists()) {
-                            val imageEntry = ZipEntry("$IMAGES_DIR_NAME/${imageFile.name}")
-                            zipOut.putNextEntry(imageEntry)
-                            
-                            FileInputStream(imageFile).use { imageInput ->
-                                imageInput.copyTo(zipOut)
-                            }
-                            zipOut.closeEntry()
-                        }
-                    } catch (e: Exception) {
-                        // Log error but continue with other images
-                        e.printStackTrace()
                     }
+                    val jsonString = json.encodeToString(com.atridad.openclimb.data.repository.ClimbDataExport.serializer(), exportData)
+                    
+                    val jsonEntry = ZipEntry(DATA_JSON_FILENAME)
+                    zipOut.putNextEntry(jsonEntry)
+                    zipOut.write(jsonString.toByteArray())
+                    zipOut.closeEntry()
+                    
+                    // Add images with validation
+                    var successfulImages = 0
+                    referencedImagePaths.forEach { imagePath ->
+                        try {
+                            val imageFile = ImageUtils.getImageFile(context, imagePath)
+                            if (imageFile.exists() && imageFile.length() > 0) {
+                                val imageEntry = ZipEntry("$IMAGES_DIR_NAME/${imageFile.name}")
+                                zipOut.putNextEntry(imageEntry)
+                                
+                                FileInputStream(imageFile).use { imageInput ->
+                                    imageInput.copyTo(zipOut)
+                                }
+                                zipOut.closeEntry()
+                                successfulImages++
+                            }
+                        } catch (e: Exception) {
+                            android.util.Log.e("ZipExportImportUtils", "Failed to add image $imagePath: ${e.message}")
+                        }
+                    }
+                    
+                    android.util.Log.i("ZipExportImportUtils", "Export to URI completed: ${successfulImages}/${referencedImagePaths.size} images included")
                 }
-            }
+            } ?: throw IOException("Could not open output stream")
-        } ?: throw IOException("Could not open output stream")
+            
+        } catch (e: Exception) {
+            throw IOException("Failed to create export ZIP to URI: ${e.message}")
+        }
+    }
+    
+    private fun createMetadata(
+        exportData: com.atridad.openclimb.data.repository.ClimbDataExport,
+        referencedImagePaths: Set<String>
+    ): String {
+        return buildString {
+            appendLine("OpenClimb Export Metadata")
+            appendLine("=======================")
+            appendLine("Export Date: ${exportData.exportedAt}")
+            appendLine("Version: ${exportData.version}")
+            appendLine("Gyms: ${exportData.gyms.size}")
+            appendLine("Problems: ${exportData.problems.size}")
+            appendLine("Sessions: ${exportData.sessions.size}")
+            appendLine("Attempts: ${exportData.attempts.size}")
+            appendLine("Referenced Images: ${referencedImagePaths.size}")
+            appendLine("Format: ZIP with embedded JSON data and images")
+        }
     }
     
     /**
@@ -133,50 +200,89 @@ object ZipExportImportUtils {
      */
     fun extractImportZip(context: Context, zipFile: File): ImportResult {
         var jsonContent = ""
+        var metadataContent = ""
         val importedImagePaths = mutableMapOf<String, String>()
+        var foundRequiredFiles = mutableSetOf<String>()
         
-        ZipInputStream(FileInputStream(zipFile)).use { zipIn ->
+        try {
-            var entry = zipIn.nextEntry
+            ZipInputStream(FileInputStream(zipFile)).use { zipIn ->
+                var entry = zipIn.nextEntry
                 
-            while (entry != null) {
+                while (entry != null) {
-                when {
+                    when {
-                    entry.name == DATA_JSON_FILENAME -> {
+                        entry.name == METADATA_FILENAME -> {
-                        // Read JSON data
+                            // Read metadata for validation
-                        jsonContent = zipIn.readBytes().toString(Charsets.UTF_8)
+                            metadataContent = zipIn.readBytes().toString(Charsets.UTF_8)
-                    }
+                            foundRequiredFiles.add("metadata")
-                    
+                            android.util.Log.i("ZipExportImportUtils", "Found metadata: ${metadataContent.lines().take(3).joinToString()}")
-                    entry.name.startsWith("$IMAGES_DIR_NAME/") && !entry.isDirectory -> {
-                        // Extract image file
-                        val originalFilename = entry.name.substringAfter("$IMAGES_DIR_NAME/")
-                        
-                        // Create temporary file to hold the extracted image
-                        val tempFile = File.createTempFile("import_image_", "_$originalFilename", context.cacheDir)
-                        
-                        FileOutputStream(tempFile).use { output ->
-                            zipIn.copyTo(output)
                         }
                         
-                        // Import the image to permanent storage
+                        entry.name == DATA_JSON_FILENAME -> {
-                        val newPath = ImageUtils.importImageFile(context, tempFile)
+                            // Read JSON data
-                        if (newPath != null) {
+                            jsonContent = zipIn.readBytes().toString(Charsets.UTF_8)
-                            importedImagePaths[originalFilename] = newPath
+                            foundRequiredFiles.add("data")
                         }
                         
-                        // Clean up temp file
+                        entry.name.startsWith("$IMAGES_DIR_NAME/") && !entry.isDirectory -> {
-                        tempFile.delete()
+                            // Extract image file
+                            val originalFilename = entry.name.substringAfter("$IMAGES_DIR_NAME/")
+                            
+                            try {
+                                // Create temporary file to hold the extracted image
+                                val tempFile = File.createTempFile("import_image_", "_$originalFilename", context.cacheDir)
+                                
+                                FileOutputStream(tempFile).use { output ->
+                                    zipIn.copyTo(output)
+                                }
+                                
+                                // Validate the extracted image
+                                if (tempFile.exists() && tempFile.length() > 0) {
+                                    // Import the image to permanent storage
+                                    val newPath = ImageUtils.importImageFile(context, tempFile)
+                                    if (newPath != null) {
+                                        importedImagePaths[originalFilename] = newPath
+                                        android.util.Log.d("ZipExportImportUtils", "Successfully imported image: $originalFilename -> $newPath")
+                                    } else {
+                                        android.util.Log.w("ZipExportImportUtils", "Failed to import image: $originalFilename")
+                                    }
+                                } else {
+                                    android.util.Log.w("ZipExportImportUtils", "Extracted image is empty: $originalFilename")
+                                }
+                                
+                                // Clean up temp file
+                                tempFile.delete()
+                                
+                            } catch (e: Exception) {
+                                android.util.Log.e("ZipExportImportUtils", "Failed to process image $originalFilename: ${e.message}")
+                            }
+                        }
+                        
+                        else -> {
+                            android.util.Log.d("ZipExportImportUtils", "Skipping ZIP entry: ${entry.name}")
+                        }
                     }
+                    
+                    zipIn.closeEntry()
+                    entry = zipIn.nextEntry
                 }
-                
-                zipIn.closeEntry()
-                entry = zipIn.nextEntry
             }
-        }
             
-        if (jsonContent.isEmpty()) {
+            // Validate that we found the required files
-            throw IOException("No data.json file found in the ZIP archive")
+            if (!foundRequiredFiles.contains("data")) {
-        }
+                throw IOException("Invalid ZIP file: data.json not found")
+            }
             
-        return ImportResult(jsonContent, importedImagePaths)
+            if (jsonContent.isBlank()) {
+                throw IOException("Invalid ZIP file: data.json is empty")
+            }
+            
+            android.util.Log.i("ZipExportImportUtils", "Import extraction completed: ${importedImagePaths.size} images processed")
+            
+            return ImportResult(jsonContent, importedImagePaths)
+            
+        } catch (e: Exception) {
+            throw IOException("Failed to extract import ZIP: ${e.message}")
+        }
     }
 
     /**

app/src/main/res/values-night/colors.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Splash background (dark) -->
+    <color name="splash_background">#FF121212</color>
+</resources>
+

app/src/main/res/values/colors.xml

@@ -7,4 +7,7 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <!-- Splash background (light) -->
+    <color name="splash_background">#FFFFFFFF</color>
 </resources>

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

@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">OpenClimb</string>
+    <string name="session_tracking_service_description">Tracks active climbing sessions and displays session information in the notification area</string>
 </resources>

app/src/main/res/values/themes.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <style name="Theme.OpenClimb" parent="android:Theme.Material.Light.NoActionBar" />
+
+    <style name="Theme.OpenClimb.Splash" parent="Theme.OpenClimb">
+        <item name="android:windowSplashScreenBackground">@color/splash_background</item>
+        <item name="android:windowSplashScreenAnimatedIcon">@drawable/ic_mountains</item>
+        <item name="android:windowSplashScreenAnimationDuration">200</item>
+    </style>
 </resources>

gradle/libs.versions.toml

@@ -1,10 +1,14 @@
 [versions]
-agp = "8.9.1"
+agp = "8.12.1"
 kotlin = "2.0.21"
 coreKtx = "1.15.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
+androidxTestCore = "1.6.0"
+androidxTestExt = "1.2.0"
+androidxTestRunner = "1.6.0"
+androidxTestRules = "1.6.0"
 lifecycleRuntimeKtx = "2.9.2"
 activityCompose = "1.10.1"
 composeBom = "2024.09.00"
@@ -21,6 +25,10 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref =
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" }
+androidx-test-ext = { group = "androidx.test.ext", name = "junit", version.ref = "androidxTestExt" }
+androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" }
+androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" }
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
@@ -48,6 +56,10 @@ kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-
 
 # Coroutines
 kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
+kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
+
+# Testing
+mockk = { group = "io.mockk", name = "mockk", version = "1.13.8" }
 
 # Image Loading
 coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Aug 15 11:23:25 MDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists