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

New builds for iOS 1.0.3 and Android 1.5.1

Browse Source
This commit is contained in:
Atridad Lahiji
2025-09-27 18:47:09 -06:00
parent 346f1a438e
commit cf2e2f7c57
22 changed files with 1272 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle.kts
View File

@@ -16,7 +16,7 @@ android {
applicationId = "com.atridad.openclimb" applicationId = "com.atridad.openclimb"
minSdk = 31 minSdk = 31
targetSdk = 36 targetSdk = 36
versionCode = 25 versionCode = 26
versionName = "1.5.1" versionName = "1.5.1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

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

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

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

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

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

@@ -82,7 +82,7 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
val exportData = val exportData =
ClimbDataExport( ClimbDataExport(
exportedAt = LocalDateTime.now().toString(), exportedAt = LocalDateTime.now().toString(),
version = "1.0", version = "2.0",
gyms = allGyms, gyms = allGyms,
problems = allProblems, problems = allProblems,
sessions = allSessions, sessions = allSessions,
@@ -141,7 +141,7 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
val exportData = val exportData =
ClimbDataExport( ClimbDataExport(
exportedAt = LocalDateTime.now().toString(), exportedAt = LocalDateTime.now().toString(),
version = "1.0", version = "2.0",
gyms = allGyms, gyms = allGyms,
problems = allProblems, problems = allProblems,
sessions = allSessions, sessions = allSessions,
@@ -343,7 +343,7 @@ class ClimbRepository(database: OpenClimbDatabase, private val context: Context)
@kotlinx.serialization.Serializable @kotlinx.serialization.Serializable
data class ClimbDataExport( data class ClimbDataExport(
val exportedAt: String, val exportedAt: String,
val version: String = "1.0", val version: String = "2.0",
val gyms: List<Gym>, val gyms: List<Gym>,
val problems: List<Problem>, val problems: List<Problem>,
val sessions: List<ClimbSession>, val sessions: List<ClimbSession>,

986
android/app/src/main/java/com/atridad/openclimb/ui/screens/AddEditScreens.kt
View File

File diff suppressed because it is too large Load Diff

9
android/app/src/main/java/com/atridad/openclimb/ui/screens/DetailScreens.kt
View File

@@ -693,15 +693,6 @@ fun ProblemDetailScreen(
} }
} }
problem?.setter?.let { setter ->
Spacer(modifier = Modifier.height(8.dp))
Text(
text = "Set by: $setter",
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant
)
}
if (problem?.tags?.isNotEmpty() == true) { if (problem?.tags?.isNotEmpty() == true) {
Spacer(modifier = Modifier.height(12.dp)) Spacer(modifier = Modifier.height(12.dp))
LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) { LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {

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

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

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

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

8
ios/OpenClimb.xcodeproj/project.pbxproj
View File

@@ -394,7 +394,7 @@
CODE_SIGN_ENTITLEMENTS = OpenClimb/OpenClimb.entitlements; CODE_SIGN_ENTITLEMENTS = OpenClimb/OpenClimb.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = 4BC9Y2LL4B; DEVELOPMENT_TEAM = 4BC9Y2LL4B;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
@@ -437,7 +437,7 @@
CODE_SIGN_ENTITLEMENTS = OpenClimb/OpenClimb.entitlements; CODE_SIGN_ENTITLEMENTS = OpenClimb/OpenClimb.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = 4BC9Y2LL4B; DEVELOPMENT_TEAM = 4BC9Y2LL4B;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
@@ -479,7 +479,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements; CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = 4BC9Y2LL4B; DEVELOPMENT_TEAM = 4BC9Y2LL4B;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = SessionStatusLive/Info.plist; INFOPLIST_FILE = SessionStatusLive/Info.plist;
@@ -509,7 +509,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements; CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = 4BC9Y2LL4B; DEVELOPMENT_TEAM = 4BC9Y2LL4B;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = SessionStatusLive/Info.plist; INFOPLIST_FILE = SessionStatusLive/Info.plist;

BIN
ios/OpenClimb.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

0
ios/OpenClimb.xcodeproj/xcshareddata/xcschemes/OpenClimb.xcscheme Normal file
View File

114
ios/OpenClimb.xcodeproj/xcshareddata/xcschemes/SessionStatusLiveExtension.xcscheme Normal file
View File

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

15
ios/OpenClimb.xcodeproj/xcuserdata/atridad.xcuserdatad/xcschemes/xcschememanagement.plist
View File

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

18
ios/OpenClimb/Models/DataModels.swift
View File

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

12
ios/OpenClimb/ViewModels/ClimbingDataManager.swift
View File

@@ -475,7 +475,7 @@ class ClimbingDataManager: ObservableObject {
let exportData = ClimbDataExport( let exportData = ClimbDataExport(
exportedAt: dateFormatter.string(from: Date()), exportedAt: dateFormatter.string(from: Date()),
version: "1.0", version: "2.0",
gyms: gyms.map { AndroidGym(from: $0) }, gyms: gyms.map { AndroidGym(from: $0) },
problems: problems.map { AndroidProblem(from: $0) }, problems: problems.map { AndroidProblem(from: $0) },
sessions: sessions.map { AndroidClimbSession(from: $0) }, sessions: sessions.map { AndroidClimbSession(from: $0) },
@@ -593,7 +593,7 @@ struct ClimbDataExport: Codable {
let attempts: [AndroidAttempt] let attempts: [AndroidAttempt]
init( init(
exportedAt: String, version: String = "1.0", gyms: [AndroidGym], problems: [AndroidProblem], exportedAt: String, version: String = "2.0", gyms: [AndroidGym], problems: [AndroidProblem],
sessions: [AndroidClimbSession], attempts: [AndroidAttempt] sessions: [AndroidClimbSession], attempts: [AndroidAttempt]
) { ) {
self.exportedAt = exportedAt self.exportedAt = exportedAt
@@ -675,7 +675,6 @@ struct AndroidProblem: Codable {
let description: String? let description: String?
let climbType: ClimbType let climbType: ClimbType
let difficulty: DifficultyGrade let difficulty: DifficultyGrade
let setter: String?
let tags: [String] let tags: [String]
let location: String? let location: String?
let imagePaths: [String]? let imagePaths: [String]?
@@ -692,7 +691,6 @@ struct AndroidProblem: Codable {
self.description = problem.description self.description = problem.description
self.climbType = problem.climbType self.climbType = problem.climbType
self.difficulty = problem.difficulty self.difficulty = problem.difficulty
self.setter = problem.setter
self.tags = problem.tags self.tags = problem.tags
self.location = problem.location self.location = problem.location
self.imagePaths = problem.imagePaths.isEmpty ? nil : problem.imagePaths self.imagePaths = problem.imagePaths.isEmpty ? nil : problem.imagePaths
@@ -707,7 +705,7 @@ struct AndroidProblem: Codable {
init( init(
id: String, gymId: String, name: String?, description: String?, climbType: ClimbType, id: String, gymId: String, name: String?, description: String?, climbType: ClimbType,
difficulty: DifficultyGrade, setter: String? = nil, tags: [String] = [], difficulty: DifficultyGrade, tags: [String] = [],
location: String? = nil, location: String? = nil,
imagePaths: [String]? = nil, isActive: Bool = true, dateSet: String? = nil, imagePaths: [String]? = nil, isActive: Bool = true, dateSet: String? = nil,
notes: String? = nil, notes: String? = nil,
@@ -719,7 +717,6 @@ struct AndroidProblem: Codable {
self.description = description self.description = description
self.climbType = climbType self.climbType = climbType
self.difficulty = difficulty self.difficulty = difficulty
self.setter = setter
self.tags = tags self.tags = tags
self.location = location self.location = location
self.imagePaths = imagePaths self.imagePaths = imagePaths
@@ -746,7 +743,6 @@ struct AndroidProblem: Codable {
description: description, description: description,
climbType: climbType, climbType: climbType,
difficulty: difficulty, difficulty: difficulty,
setter: setter,
tags: tags, tags: tags,
location: location, location: location,
imagePaths: imagePaths ?? [], imagePaths: imagePaths ?? [],
@@ -766,7 +762,6 @@ struct AndroidProblem: Codable {
description: self.description, description: self.description,
climbType: self.climbType, climbType: self.climbType,
difficulty: self.difficulty, difficulty: self.difficulty,
setter: self.setter,
tags: self.tags, tags: self.tags,
location: self.location, location: self.location,
imagePaths: newImagePaths.isEmpty ? nil : newImagePaths, imagePaths: newImagePaths.isEmpty ? nil : newImagePaths,
@@ -1331,7 +1326,6 @@ extension ClimbingDataManager {
description: "Technical overhang with small holds", description: "Technical overhang with small holds",
climbType: .boulder, climbType: .boulder,
difficulty: DifficultyGrade(system: .vScale, grade: "V4"), difficulty: DifficultyGrade(system: .vScale, grade: "V4"),
setter: "John Doe",
tags: ["technical", "overhang"], tags: ["technical", "overhang"],
location: "Cave area" location: "Cave area"
) )

6
ios/OpenClimb/Views/AddEdit/AddAttemptView.swift
View File

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

54
ios/OpenClimb/Views/AddEdit/AddEditProblemView.swift
View File

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

5
ios/OpenClimb/Views/Detail/GymDetailView.swift
View File

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

11
ios/OpenClimb/Views/Detail/ProblemDetailView.swift
View File

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

1
ios/OpenClimb/Views/Detail/SessionDetailView.swift
View File

@@ -280,7 +280,6 @@ struct SessionStatsCard: View {
LazyVGrid(columns: Array(repeating: GridItem(.flexible()), count: 2), spacing: 16) { LazyVGrid(columns: Array(repeating: GridItem(.flexible()), count: 2), spacing: 16) {
StatItem(label: "Total Attempts", value: "\(stats.totalAttempts)") StatItem(label: "Total Attempts", value: "\(stats.totalAttempts)")
StatItem(label: "Problems", value: "\(stats.uniqueProblemsAttempted)") StatItem(label: "Problems", value: "\(stats.uniqueProblemsAttempted)")
StatItem(label: "Successful", value: "\(stats.successfulAttempts)")
StatItem(label: "Completed", value: "\(stats.uniqueProblemsCompleted)") StatItem(label: "Completed", value: "\(stats.uniqueProblemsCompleted)")
} }
} }

6
ios/OpenClimb/Views/GymsView.swift
View File

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

29
ios/OpenClimb/Views/ProblemsView.swift
View File

@@ -13,10 +13,9 @@ struct ProblemsView: View {
// Apply search filter // Apply search filter
if !searchText.isEmpty { if !searchText.isEmpty {
filtered = filtered.filter { problem in filtered = filtered.filter { problem in
(problem.name?.localizedCaseInsensitiveContains(searchText) ?? false) return problem.name?.localizedCaseInsensitiveContains(searchText) ?? false
|| (problem.description?.localizedCaseInsensitiveContains(searchText) ?? false) || (problem.description?.localizedCaseInsensitiveContains(searchText) ?? false)
|| (problem.location?.localizedCaseInsensitiveContains(searchText) ?? false) || (problem.location?.localizedCaseInsensitiveContains(searchText) ?? false)
|| (problem.setter?.localizedCaseInsensitiveContains(searchText) ?? false)
|| problem.tags.contains { $0.localizedCaseInsensitiveContains(searchText) } || problem.tags.contains { $0.localizedCaseInsensitiveContains(searchText) }
} }
} }
@@ -31,7 +30,11 @@ struct ProblemsView: View {
filtered = filtered.filter { $0.gymId == gym.id } filtered = filtered.filter { $0.gymId == gym.id }
} }
return filtered.sorted { $0.updatedAt > $1.updatedAt } // Separate active and inactive problems
let active = filtered.filter { $0.isActive }.sorted { $0.updatedAt > $1.updatedAt }
let inactive = filtered.filter { !$0.isActive }.sorted { $0.updatedAt > $1.updatedAt }
return active + inactive
} }
var body: some View { var body: some View {
@@ -195,10 +198,23 @@ struct ProblemsList: View {
Label("Delete", systemImage: "trash") Label("Delete", systemImage: "trash")
} }
Button {
let updatedProblem = problem.updated(isActive: !problem.isActive)
dataManager.updateProblem(updatedProblem)
} label: {
Label(
problem.isActive ? "Mark as Reset" : "Mark as Active",
systemImage: problem.isActive ? "xmark.circle" : "checkmark.circle")
}
.tint(.orange)
Button { Button {
problemToEdit = problem problemToEdit = problem
} label: { } label: {
Label("Edit", systemImage: "pencil") HStack {
Image(systemName: "pencil")
Text("Edit")
}
} }
.tint(.blue) .tint(.blue)
} }
@@ -239,6 +255,7 @@ struct ProblemRow: View {
Text(problem.name ?? "Unnamed Problem") Text(problem.name ?? "Unnamed Problem")
.font(.headline) .font(.headline)
.fontWeight(.semibold) .fontWeight(.semibold)
.foregroundColor(problem.isActive ? .primary : .secondary)
Text(gym?.name ?? "Unknown Gym") Text(gym?.name ?? "Unknown Gym")
.font(.subheadline) .font(.subheadline)
@@ -295,9 +312,9 @@ struct ProblemRow: View {
} }
if !problem.isActive { if !problem.isActive {
Text("Inactive") Text("Reset / No Longer Set")
.font(.caption) .font(.caption)
.foregroundColor(.red) .foregroundColor(.orange)
.fontWeight(.medium) .fontWeight(.medium)
} }
} }