Sfoglia il codice sorgente

Removed unnecessary extension function

Vadik Sirekanyan 4 anni fa
parent
commit
fa49475cd1

+ 9 - 11
app/src/main/java/com/sirekanyan/knigopis/common/extensions/Resources.kt

@@ -3,17 +3,15 @@ package com.sirekanyan.knigopis.common.extensions
 import android.content.res.Resources
 import com.sirekanyan.knigopis.R
 
-fun Resources.getTitleString(title: String): String {
-    return title.orDefault(getString(R.string.common_book_notitle))
-}
+fun Resources.getTitleString(title: String): String =
+    title.ifEmpty { getString(R.string.common_book_notitle) }
 
-fun Resources.getAuthorString(author: String): String {
-    return author.orDefault(getString(R.string.common_book_noauthor))
-}
+fun Resources.getAuthorString(author: String): String =
+    author.ifEmpty { getString(R.string.common_book_noauthor) }
 
-fun Resources.getFullTitleString(title: String, author: String): String {
-    return when {
-        author.isEmpty() -> getTitleString(title)
-        else -> "${getTitleString(title)} — ${getAuthorString(author)}"
+fun Resources.getFullTitleString(title: String, author: String): String =
+    if (author.isEmpty()) {
+        getTitleString(title)
+    } else {
+        "${getTitleString(title)} — ${getAuthorString(author)}"
     }
-}

+ 0 - 2
app/src/main/java/com/sirekanyan/knigopis/common/extensions/String.kt

@@ -10,8 +10,6 @@ private val HTTP_SCHEMES = setOf("http", "https")
 
 val String.lowercase get() = lowercase(Locale.getDefault())
 
-fun String.orDefault(default: String) = if (isEmpty()) default else this
-
 fun String.toUriOrNull() =
     Uri.parse(this).takeIf(Uri::isValidHttpLink)
 

+ 1 - 2
app/src/main/java/com/sirekanyan/knigopis/model/BookModel.kt

@@ -3,11 +3,10 @@ package com.sirekanyan.knigopis.model
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.android.ResourceProvider
 import com.sirekanyan.knigopis.common.android.adapter.HeadedModel
-import com.sirekanyan.knigopis.common.extensions.orDefault
 import com.sirekanyan.knigopis.common.functions.createBookImageUrl
 
 fun createBookHeaderModel(resources: ResourceProvider, title: String, count: Int): BookHeaderModel {
-    val titleOrDefault = title.orDefault(resources.getString(R.string.books_header_done_other))
+    val titleOrDefault = title.ifEmpty { resources.getString(R.string.books_header_done_other) }
     val countText = resources.getQuantityString(R.plurals.common_header_books, count, count)
     return BookHeaderModel(titleOrDefault, countText)
 }