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

1.3.1 - Graphing Fixes Cont'd

Browse Source
This commit is contained in:
Atridad Lahiji
2025-08-31 19:03:43 -06:00
parent 3245937743
commit 20f48a31c0
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@@ -16,8 +16,8 @@ android {
applicationId = "com.atridad.openclimb" applicationId = "com.atridad.openclimb"
minSdk = 34 minSdk = 34
targetSdk = 36 targetSdk = 36
versionCode = 19 versionCode = 20
versionName = "1.3.0" versionName = "1.3.1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }

10
app/src/main/java/com/atridad/openclimb/ui/screens/AnalyticsScreen.kt
View File

@@ -132,14 +132,12 @@ fun ProgressChartCard(
progressData: List<ProgressDataPoint>, progressData: List<ProgressDataPoint>,
problems: List<com.atridad.openclimb.data.model.Problem>, problems: List<com.atridad.openclimb.data.model.Problem>,
) { ) {
// Find all grading systems that have been used // Find all grading systems that have been used in the progress data
val usedSystems = remember(problems) { val usedSystems = remember(progressData) {
problems.map { it.difficulty.system }.distinct().filter { system -> progressData.map { it.difficultySystem }.distinct()
problems.any { it.difficulty.system == system }
}
} }
var selectedSystem by remember { var selectedSystem by remember(usedSystems) {
mutableStateOf(usedSystems.firstOrNull() ?: DifficultySystem.V_SCALE) mutableStateOf(usedSystems.firstOrNull() ?: DifficultySystem.V_SCALE)
} }
var expanded by remember { mutableStateOf(false) } var expanded by remember { mutableStateOf(false) }

2
gradle/libs.versions.toml
View File

@@ -1,5 +1,5 @@
[versions] [versions]
agp = "8.12.1" agp = "8.12.2"
kotlin = "2.2.10" kotlin = "2.2.10"
coreKtx = "1.17.0" coreKtx = "1.17.0"
junit = "4.13.2" junit = "4.13.2"