优化代码

pull/743/head
gedoor 5 years ago
parent 961784403c
commit 8a92a14944
  1. 23
      app/src/main/java/io/legado/app/ui/about/ReadRecordActivity.kt
  2. 40
      app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt
  3. 1
      app/src/main/res/values-zh-rHK/strings.xml
  4. 1
      app/src/main/res/values-zh-rTW/strings.xml
  5. 1
      app/src/main/res/values-zh/strings.xml
  6. 1
      app/src/main/res/values/strings.xml

@ -113,19 +113,24 @@ class ReadRecordActivity : BaseActivity<ActivityReadRecordBinding>() {
override fun registerListener(holder: ItemViewHolder, binding: ItemReadRecordBinding) { override fun registerListener(holder: ItemViewHolder, binding: ItemReadRecordBinding) {
binding.apply { binding.apply {
ivRemove.onClick { ivRemove.onClick {
alert(R.string.delete, R.string.sure_del) { getItem(holder.layoutPosition)?.let { item ->
okButton { sureDelAlert(item)
getItem(holder.layoutPosition)?.let { }
App.db.readRecordDao.deleteByName(it.bookName)
initData()
}
}
noButton()
}.show()
} }
} }
} }
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 { fun formatDuring(mss: Long): String {

@ -83,27 +83,25 @@ class BookmarkFragment : VMBaseFragment<ChapterListViewModel>(R.layout.fragment_
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
override fun onLongClick(bookmark: Bookmark) { override fun onLongClick(bookmark: Bookmark) {
viewModel.book?.let { book -> requireContext().alert(R.string.bookmark) {
requireContext().alert(R.string.bookmark) { val alertBinding = DialogEditTextBinding.inflate(layoutInflater)
val alertBinding = DialogEditTextBinding.inflate(layoutInflater) message = bookmark.bookText
message = book.name + "" + bookmark.chapterName customView {
customView { alertBinding.apply {
alertBinding.apply { editView.setHint(R.string.note_content)
editView.setHint(R.string.note_content) editView.setText(bookmark.content)
editView.setText(bookmark.content) }.root
}.root }
} yesButton {
yesButton { alertBinding.editView.text?.toString()?.let { editContent ->
alertBinding.editView.text?.toString()?.let { editContent -> bookmark.content = editContent
bookmark.content = editContent App.db.bookmarkDao.update(bookmark)
App.db.bookmarkDao.update(bookmark)
}
} }
noButton() }
neutralButton(R.string.delete) { noButton()
App.db.bookmarkDao.delete(bookmark) neutralButton(R.string.delete) {
} App.db.bookmarkDao.delete(bookmark)
}.show().requestInputMethod() }
} }.show().requestInputMethod()
} }
} }

@ -474,6 +474,7 @@
<string name="no"></string> <string name="no"></string>
<string name="sure">確認</string> <string name="sure">確認</string>
<string name="sure_del">是否確認刪除?</string> <string name="sure_del">是否確認刪除?</string>
<string name="sure_del_any">是否確認刪除 %s?</string>
<string name="sure_del_all_book">是否刪除全部書籍?</string> <string name="sure_del_all_book">是否刪除全部書籍?</string>
<string name="sure_del_download_book">是否同時刪除已下載的書籍目錄?</string> <string name="sure_del_download_book">是否同時刪除已下載的書籍目錄?</string>
<string name="qr_per">掃描二維碼需相機權限</string> <string name="qr_per">掃描二維碼需相機權限</string>

@ -476,6 +476,7 @@
<string name="no"></string> <string name="no"></string>
<string name="sure">確認</string> <string name="sure">確認</string>
<string name="sure_del">是否確認刪除?</string> <string name="sure_del">是否確認刪除?</string>
<string name="sure_del_any">是否確認刪除 %s?</string>
<string name="sure_del_all_book">是否刪除全部書籍?</string> <string name="sure_del_all_book">是否刪除全部書籍?</string>
<string name="sure_del_download_book">是否同時刪除已下載的書籍目錄?</string> <string name="sure_del_download_book">是否同時刪除已下載的書籍目錄?</string>
<string name="qr_per">掃描二維碼需相機權限</string> <string name="qr_per">掃描二維碼需相機權限</string>

@ -484,6 +484,7 @@
<string name="no"></string> <string name="no"></string>
<string name="sure">确认</string> <string name="sure">确认</string>
<string name="sure_del">是否确认删除?</string> <string name="sure_del">是否确认删除?</string>
<string name="sure_del_any">是否确认删除 %s?</string>
<string name="sure_del_all_book">是否删除全部书籍?</string> <string name="sure_del_all_book">是否删除全部书籍?</string>
<string name="sure_del_download_book">是否同时删除已下载的书籍目录?</string> <string name="sure_del_download_book">是否同时删除已下载的书籍目录?</string>
<string name="qr_per">扫描二维码需相机权限</string> <string name="qr_per">扫描二维码需相机权限</string>

@ -485,6 +485,7 @@
<string name="no">No</string> <string name="no">No</string>
<string name="sure">OK</string> <string name="sure">OK</string>
<string name="sure_del">Are you sure to delete it?</string> <string name="sure_del">Are you sure to delete it?</string>
<string name="sure_del_any">Are you sure to delete %s?</string>
<string name="sure_del_all_book">Are you sure to delete all books?</string> <string name="sure_del_all_book">Are you sure to delete all books?</string>
<string name="sure_del_download_book">Do you want to delete the downloaded book chapters at the same time?</string> <string name="sure_del_download_book">Do you want to delete the downloaded book chapters at the same time?</string>
<string name="qr_per">Scan QR code requires Camera permissions</string> <string name="qr_per">Scan QR code requires Camera permissions</string>

Loading…
Cancel
Save