diff --git a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt index 9302cf28a..558f03e84 100644 --- a/app/src/main/java/io/legado/app/data/entities/BookChapter.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookChapter.kt @@ -6,7 +6,6 @@ import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Ignore import androidx.room.Index -import io.legado.app.R import io.legado.app.constant.AppLog import io.legado.app.constant.AppPattern import io.legado.app.data.appDb @@ -138,11 +137,7 @@ data class BookChapter( } } } - return when { - !isVip -> displayTitle - isPay -> appCtx.getString(R.string.payed_title, displayTitle) - else -> appCtx.getString(R.string.vip_title, displayTitle) - } + return displayTitle } fun getAbsoluteURL(): String { diff --git a/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt index 6b8ec5928..1033fd1be 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt @@ -195,6 +195,8 @@ class BookSourceDebugActivity : VMBaseActivity showDialogFragment(TextDialog("html", viewModel.contentSrc)) R.id.menu_refresh_explore -> lifecycleScope.launch { viewModel.bookSource?.clearExploreKindsCache() + adapter.clearItems() + openOrCloseHelp(true) initExploreKinds() } R.id.menu_help -> showHelp("debugHelp") diff --git a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt index 462c68eff..afa2f7d3e 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt @@ -159,6 +159,12 @@ class ChapterListAdapter(context: Context, val callback: Callback) : tvWordCount.gone() } + if (item.isVip && !item.isPay) { + ivLocked.visible() + } else { + ivLocked.gone() + } + upHasCache(binding, isDur, cached) } else { tvChapterName.text = getDisplayTitle(item) diff --git a/app/src/main/res/drawable/ic_lock_outline.xml b/app/src/main/res/drawable/ic_lock_outline.xml new file mode 100644 index 000000000..d052b7087 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock_outline.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/src/main/res/layout/item_chapter_list.xml b/app/src/main/res/layout/item_chapter_list.xml index 879053eb1..71580c865 100644 --- a/app/src/main/res/layout/item_chapter_list.xml +++ b/app/src/main/res/layout/item_chapter_list.xml @@ -9,13 +9,26 @@ android:orientation="vertical" android:padding="12dp"> + + @@ -35,7 +48,7 @@ android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintLeft_toRightOf="@+id/iv_locked" app:layout_constraintTop_toBottomOf="@+id/barrier" tools:ignore="RtlSymmetry" />