From 40ea700e0bdf5790515fb0fa35ea9573f4609be0 Mon Sep 17 00:00:00 2001 From: sadorowo Date: Sat, 15 Jun 2024 12:18:35 +0200 Subject: [PATCH] remove duplicated string extension --- .../data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt | 2 +- .../main/java/pl/szczodrzynski/edziennik/ext/TextExtensions.kt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt index 0414bd0a..9e1da4f2 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeGrades.kt @@ -38,7 +38,7 @@ class VulcanHebeGrades( val column = grade.getJsonObject("Column") val category = column.getJsonObject("Category") val categoryText = category.getString("Name") - val code = column.getString("Code").orNullIfEmpty() + val code = column.getString("Code").takeValue() val teacherId = getTeacherId(grade, "Creator") ?: -1 val subjectId = getSubjectId(column, "Subject") ?: -1 diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ext/TextExtensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ext/TextExtensions.kt index d8853178..d4149320 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ext/TextExtensions.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ext/TextExtensions.kt @@ -141,8 +141,6 @@ fun String.fixWhiteSpaces() = buildString(length) { } }.trimEnd() -fun String?.orNullIfEmpty(): String? = if (this.isNullOrEmpty()) null else this - fun CharSequence?.asColoredSpannable(colorInt: Int): Spannable { val spannable = SpannableString(this) spannable.setSpan(ForegroundColorSpan(colorInt), 0, spannable.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)