Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
0537da79e4
|
|||
|
4804049274
|
@@ -16,8 +16,8 @@ android {
|
||||
applicationId = "com.atridad.openclimb"
|
||||
minSdk = 34
|
||||
targetSdk = 36
|
||||
versionCode = 19
|
||||
versionName = "1.3.0"
|
||||
versionCode = 20
|
||||
versionName = "1.3.1"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@@ -132,14 +132,12 @@ fun ProgressChartCard(
|
||||
progressData: List<ProgressDataPoint>,
|
||||
problems: List<com.atridad.openclimb.data.model.Problem>,
|
||||
) {
|
||||
// Find all grading systems that have been used
|
||||
val usedSystems = remember(problems) {
|
||||
problems.map { it.difficulty.system }.distinct().filter { system ->
|
||||
problems.any { it.difficulty.system == system }
|
||||
}
|
||||
// Find all grading systems that have been used in the progress data
|
||||
val usedSystems = remember(progressData) {
|
||||
progressData.map { it.difficultySystem }.distinct()
|
||||
}
|
||||
|
||||
var selectedSystem by remember {
|
||||
var selectedSystem by remember(usedSystems) {
|
||||
mutableStateOf(usedSystems.firstOrNull() ?: DifficultySystem.V_SCALE)
|
||||
}
|
||||
var expanded by remember { mutableStateOf(false) }
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[versions]
|
||||
agp = "8.12.1"
|
||||
agp = "8.12.2"
|
||||
kotlin = "2.2.10"
|
||||
coreKtx = "1.17.0"
|
||||
junit = "4.13.2"
|
||||
|
||||
Reference in New Issue
Block a user