diff --git a/app/src/main/java/io/legado/app/data/dao/RssReadRecordDao.kt b/app/src/main/java/io/legado/app/data/dao/RssReadRecordDao.kt index b876e9bc9..138a72a4e 100644 --- a/app/src/main/java/io/legado/app/data/dao/RssReadRecordDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/RssReadRecordDao.kt @@ -10,12 +10,12 @@ interface RssReadRecordDao { fun insertRecord(vararg rssReadRecord: RssReadRecord) @Query("select * from rssReadRecords order by readTime desc") - fun getRecord(): List + fun getRecords(): List @get:Query("select count(1) from rssReadRecords") - val countRead: Int + val countRecords: Int @Query("delete from rssReadRecords") - fun deleteRecord() + fun deleteAllRecord() } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/rss/article/ReadRecordDialog.kt b/app/src/main/java/io/legado/app/ui/rss/article/ReadRecordDialog.kt index 208a69f1f..53c29c94d 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/ReadRecordDialog.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/ReadRecordDialog.kt @@ -2,7 +2,6 @@ package io.legado.app.ui.rss.article import android.content.Context import android.os.Bundle -import android.text.method.ScrollingMovementMethod import android.view.MenuItem import android.view.View import android.view.ViewGroup @@ -44,18 +43,18 @@ class ReadRecordDialog : BaseDialogFragment(R.layout.dialog_recycler_view), recyclerView.layoutManager = LinearLayoutManager(requireContext()) recyclerView.adapter = adapter } - adapter.setItems(viewModel.getRecord()) + adapter.setItems(viewModel.getRecords()) } override fun onMenuItemClick(item: MenuItem?): Boolean { when (item?.itemId) { R.id.menu_clear -> { alert(R.string.draw) { - val countRead = viewModel.countRead() + val countRead = viewModel.countRecords() setMessage(getString(R.string.sure_del) + "\n" + countRead + " " + getString(R.string.read_record)) noButton() - yesButton{ - viewModel.delReadRecord() + yesButton { + viewModel.deleteAllRecord() adapter.clearItems() } } @@ -77,8 +76,6 @@ class ReadRecordDialog : BaseDialogFragment(R.layout.dialog_recycler_view), item: RssReadRecord, payloads: MutableList ) { - binding.textTitle.movementMethod = ScrollingMovementMethod() - binding.textRecord.movementMethod = ScrollingMovementMethod() binding.textTitle.text = item.title binding.textRecord.text = item.record } diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt index 614a4fbf9..e36933a84 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssSortViewModel.kt @@ -77,17 +77,17 @@ class RssSortViewModel(application: Application) : BaseViewModel(application) { } } - fun getRecord(): List { - return appDb.rssReadRecordDao.getRecord() + fun getRecords(): List { + return appDb.rssReadRecordDao.getRecords() } - fun countRead() : Int { - return appDb.rssReadRecordDao.countRead + fun countRecords() : Int { + return appDb.rssReadRecordDao.countRecords } - fun delReadRecord() { + fun deleteAllRecord() { execute { - appDb.rssReadRecordDao.deleteRecord() + appDb.rssReadRecordDao.deleteAllRecord() } }