diff --git a/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt b/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt index 7153f2e2a..ea467af80 100644 --- a/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt +++ b/app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt @@ -113,19 +113,24 @@ class ReadRecordActivity : BaseActivity() { override fun registerListener(holder: ItemViewHolder, binding: ItemReadRecordBinding) { binding.apply { ivRemove.onClick { - alert(R.string.delete, R.string.sure_del) { - okButton { - getItem(holder.layoutPosition)?.let { - App.db.readRecordDao.deleteByName(it.bookName) - initData() - } - } - noButton() - }.show() + getItem(holder.layoutPosition)?.let { item -> + sureDelAlert(item) + } } } } + private fun sureDelAlert(item: ReadRecordShow) { + alert(R.string.delete) { + message = getString(R.string.sure_del_any, item.bookName) + okButton { + App.db.readRecordDao.deleteByName(item.bookName) + initData() + } + noButton() + }.show() + } + } fun formatDuring(mss: Long): String { diff --git a/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt b/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt index c4b634ac9..2fb5a4085 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt @@ -83,27 +83,25 @@ class BookmarkFragment : VMBaseFragment(R.layout.fragment_ @SuppressLint("InflateParams") override fun onLongClick(bookmark: Bookmark) { - viewModel.book?.let { book -> - requireContext().alert(R.string.bookmark) { - val alertBinding = DialogEditTextBinding.inflate(layoutInflater) - message = book.name + " • " + bookmark.chapterName - customView { - alertBinding.apply { - editView.setHint(R.string.note_content) - editView.setText(bookmark.content) - }.root - } - yesButton { - alertBinding.editView.text?.toString()?.let { editContent -> - bookmark.content = editContent - App.db.bookmarkDao.update(bookmark) - } + requireContext().alert(R.string.bookmark) { + val alertBinding = DialogEditTextBinding.inflate(layoutInflater) + message = bookmark.bookText + customView { + alertBinding.apply { + editView.setHint(R.string.note_content) + editView.setText(bookmark.content) + }.root + } + yesButton { + alertBinding.editView.text?.toString()?.let { editContent -> + bookmark.content = editContent + App.db.bookmarkDao.update(bookmark) } - noButton() - neutralButton(R.string.delete) { - App.db.bookmarkDao.delete(bookmark) - } - }.show().requestInputMethod() - } + } + noButton() + neutralButton(R.string.delete) { + App.db.bookmarkDao.delete(bookmark) + } + }.show().requestInputMethod() } } \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 33f41ba8c..659f2fe15 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -474,6 +474,7 @@ 確認 是否確認刪除? + 是否確認刪除 %s? 是否刪除全部書籍? 是否同時刪除已下載的書籍目錄? 掃描二維碼需相機權限 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 132c8ac83..b8bf69e99 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -476,6 +476,7 @@ 確認 是否確認刪除? + 是否確認刪除 %s? 是否刪除全部書籍? 是否同時刪除已下載的書籍目錄? 掃描二維碼需相機權限 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 888dee9f4..6454737c3 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -484,6 +484,7 @@ 确认 是否确认删除? + 是否确认删除 %s? 是否删除全部书籍? 是否同时删除已下载的书籍目录? 扫描二维码需相机权限 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6a19ba8bf..f5a3a53e5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -485,6 +485,7 @@ No OK Are you sure to delete it? + Are you sure to delete %s? Are you sure to delete all books? Do you want to delete the downloaded book chapters at the same time? Scan QR code requires Camera permissions