diff --git a/app/src/main/java/io/legado/app/data/entities/SearchBook.kt b/app/src/main/java/io/legado/app/data/entities/SearchBook.kt index fb3ef7154..17ddf9dff 100644 --- a/app/src/main/java/io/legado/app/data/entities/SearchBook.kt +++ b/app/src/main/java/io/legado/app/data/entities/SearchBook.kt @@ -1,7 +1,9 @@ package io.legado.app.data.entities +import android.content.Context import android.os.Parcelable import androidx.room.* +import io.legado.app.R import io.legado.app.utils.GSON import io.legado.app.utils.fromJsonObject import kotlinx.parcelize.IgnoredOnParcel @@ -74,7 +76,7 @@ data class SearchBook( fun addOrigin(origin: String) { origins.add(origin) } - + fun getDisplayLastChapterTitle(): String { latestChapterTitle?.let { if (it.isNotEmpty()) { @@ -83,7 +85,16 @@ data class SearchBook( } return "无最新章节" } - + + fun trimIntro(context: Context): String { + val trimIntro = intro?.trim() + return if (trimIntro.isNullOrEmpty()) { + context.getString(R.string.intro_show_null) + } else { + context.getString(R.string.intro_show, trimIntro) + } + } + fun toBook() = Book( name = name, author = author, diff --git a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowAdapter.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowAdapter.kt index 9c0e521b7..99d6b9285 100644 --- a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowAdapter.kt @@ -34,11 +34,7 @@ class ExploreShowAdapter(context: Context, val callBack: CallBack) : tvLasted.text = context.getString(R.string.lasted_show, item.latestChapterTitle) tvLasted.visible() } - if (item.intro.isNullOrEmpty()) { - tvIntroduce.text = context.getString(R.string.intro_show_null) - } else { - tvIntroduce.text = context.getString(R.string.intro_show, item.intro) - } + tvIntroduce.text = item.trimIntro(context) val kinds = item.getKindList() if (kinds.isEmpty()) { llKind.gone() diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt index 70de12ac1..a1c617b08 100644 --- a/app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt @@ -79,13 +79,7 @@ class SearchAdapter(context: Context, val callBack: CallBack) : tvAuthor.text = context.getString(R.string.author_show, searchBook.author) bvOriginCount.setBadgeCount(searchBook.origins.size) upLasted(binding, searchBook.latestChapterTitle) - if (searchBook.intro.isNullOrEmpty()) { - tvIntroduce.text = - context.getString(R.string.intro_show_null) - } else { - tvIntroduce.text = - context.getString(R.string.intro_show, searchBook.intro) - } + tvIntroduce.text = searchBook.trimIntro(context) upKind(binding, searchBook.getKindList()) ivCover.load(searchBook.coverUrl, searchBook.name, searchBook.author) @@ -98,15 +92,7 @@ class SearchAdapter(context: Context, val callBack: CallBack) : when (it) { "origins" -> bvOriginCount.setBadgeCount(searchBook.origins.size) "last" -> upLasted(binding, searchBook.latestChapterTitle) - "intro" -> { - if (searchBook.intro.isNullOrEmpty()) { - tvIntroduce.text = - context.getString(R.string.intro_show_null) - } else { - tvIntroduce.text = - context.getString(R.string.intro_show, searchBook.intro) - } - } + "intro" -> tvIntroduce.text = searchBook.trimIntro(context) "kind" -> upKind(binding, searchBook.getKindList()) "cover" -> ivCover.load( searchBook.coverUrl,