sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[Grades] Disable counting grade value when custom values not specified.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2020-03-10 21:45:38 +01:00
parent 715f536b23
commit e05b483f5c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/pl/szczodrzynski/edziennik/utils/managers/GradesManager.kt
View File

@ -40,7 +40,7 @@ class GradesManager(val app: App) : CoroutineScope {
override val coroutineContext: CoroutineContext override val coroutineContext: CoroutineContext
get() = job + Dispatchers.Default get() = job + Dispatchers.Default
private val gradeRegex by lazy { """([0-6])([+-])?""".toRegex() } private val gradeRegex by lazy { """([+-])?([0-6])([+-])?""".toRegex() }
private val format = DecimalFormat("#.##") private val format = DecimalFormat("#.##")
val orderBy val orderBy
@ -85,12 +85,16 @@ class GradesManager(val app: App) : CoroutineScope {
} }
fun getGradeValue(grade: Grade): Float { fun getGradeValue(grade: Grade): Float {
gradeRegex.find(grade.name)?.let { if (plusValue == null && minusValue == null)
var value = it[1].toFloatOrNull() ?: return grade.value return grade.value
if (it[2] == "+")
value += plusValue ?: return grade.value gradeRegex.find(grade.name)?.let { it ->
if (it[2] == "-") var value = it[2].toFloatOrNull() ?: return grade.value
value -= minusValue ?: return grade.value when (it[1].notEmptyOrNull() ?: it[3]) {
"+" -> value += plusValue ?: return grade.value
"-" -> value -= minusValue ?: return grade.value
else -> return grade.value
}
return value return value
} }
return grade.value return grade.value