From e2b4134c188fcb3f5f8482789f1dd45f73508413 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 14 Jul 2019 09:38:38 +0800 Subject: [PATCH] up --- app/src/main/java/io/legado/app/data/entities/SearchBook.kt | 2 +- app/src/main/java/io/legado/app/lib/theme/ATH.kt | 2 -- app/src/main/java/io/legado/app/model/webbook/BookList.kt | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) 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 a7576cf5d..e2c64c081 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 @@ -21,7 +21,7 @@ data class SearchBook( var author: String? = null, var tag: String? = null, var coverUrl: String? = null, - var description: String? = null, + var intro: String? = null, var latestChapterTitle: String? = null, var time: Long = 0L, var variable: String? = null, diff --git a/app/src/main/java/io/legado/app/lib/theme/ATH.kt b/app/src/main/java/io/legado/app/lib/theme/ATH.kt index 1fc17238e..98fb11c35 100644 --- a/app/src/main/java/io/legado/app/lib/theme/ATH.kt +++ b/app/src/main/java/io/legado/app/lib/theme/ATH.kt @@ -89,9 +89,7 @@ object ATH { fun setTaskDescriptionColor(activity: Activity, @ColorInt color: Int) { val color1: Int if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - // Task description requires fully opaque color color1 = ColorUtils.stripAlpha(color) - // Sets color of entry in the system recents page activity.setTaskDescription(ActivityManager.TaskDescription(activity.title as String, null, color1)) } } diff --git a/app/src/main/java/io/legado/app/model/webbook/BookList.kt b/app/src/main/java/io/legado/app/model/webbook/BookList.kt index fb6212331..e16ab3a7a 100644 --- a/app/src/main/java/io/legado/app/model/webbook/BookList.kt +++ b/app/src/main/java/io/legado/app/model/webbook/BookList.kt @@ -43,6 +43,7 @@ class BookList { private fun getItem(analyzeRule: AnalyzeRule, bookSource: BookSource, baseUrl: String): SearchBook? { val searchBook = SearchBook() + searchBook.bookUrl = baseUrl analyzeRule.setBook(searchBook) with(bookSource.getBookInfoRule()) { init?.let { @@ -52,7 +53,7 @@ class BookList { if (!searchBook.name.isNullOrEmpty()) { searchBook.author = analyzeRule.getString(author ?: "") searchBook.coverUrl = analyzeRule.getString(coverUrl ?: "") - searchBook.bookUrl = baseUrl + searchBook.intro = analyzeRule.getString(intro ?: "") return searchBook } }