From 0cbca9551bedcc133865364bb0aa386e2362ea37 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sat, 2 Apr 2022 17:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E6=9C=89=E4=B9=A6?=
 =?UTF-8?q?=E7=AD=BE=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/book/bookmark/AllBookmarkActivity.kt   | 21 +++++++++++++++++--
 .../ui/book/bookmark/AllBookmarkViewModel.kt  |  6 ++++++
 .../app/ui/book/bookmark/BookmarkAdapter.kt   | 16 ++++++++++++--
 .../book/{toc => bookmark}/BookmarkDialog.kt  |  5 +++--
 .../app/ui/book/read/ReadBookActivity.kt      |  2 +-
 .../app/ui/book/toc/BookmarkFragment.kt       |  1 +
 6 files changed, 44 insertions(+), 7 deletions(-)
 rename app/src/main/java/io/legado/app/ui/book/{toc => bookmark}/BookmarkDialog.kt (95%)

diff --git a/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt
index 968af406e..1d7eb937b 100644
--- a/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt
@@ -3,15 +3,19 @@ package io.legado.app.ui.book.bookmark
 import android.os.Bundle
 import androidx.activity.viewModels
 import io.legado.app.base.VMBaseActivity
+import io.legado.app.data.entities.Bookmark
 import io.legado.app.databinding.ActivityAllBookmarkBinding
+import io.legado.app.utils.showDialogFragment
 import io.legado.app.utils.viewbindingdelegate.viewBinding
 
-class AllBookmarkActivity : VMBaseActivity<ActivityAllBookmarkBinding, AllBookmarkViewModel>() {
+class AllBookmarkActivity : VMBaseActivity<ActivityAllBookmarkBinding, AllBookmarkViewModel>(),
+    BookmarkAdapter.Callback,
+    BookmarkDialog.Callback {
 
     override val viewModel by viewModels<AllBookmarkViewModel>()
     override val binding by viewBinding(ActivityAllBookmarkBinding::inflate)
     private val adapter by lazy {
-        BookmarkAdapter(this)
+        BookmarkAdapter(this, this)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -26,5 +30,18 @@ class AllBookmarkActivity : VMBaseActivity<ActivityAllBookmarkBinding, AllBookma
         binding.recyclerView.adapter = adapter
     }
 
+    override fun onItemClick(bookmark: Bookmark, position: Int) {
+        showDialogFragment(BookmarkDialog(bookmark, position))
+    }
 
+    override fun upBookmark(pos: Int, bookmark: Bookmark) {
+        adapter.setItem(pos, bookmark)
+    }
+
+    override fun deleteBookmark(pos: Int) {
+        adapter.getItem(pos)?.let {
+            viewModel.deleteBookmark(it)
+        }
+        adapter.removeItem(pos)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkViewModel.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkViewModel.kt
index 274598ee8..f395319fb 100644
--- a/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkViewModel.kt
@@ -16,4 +16,10 @@ class AllBookmarkViewModel(application: Application) : BaseViewModel(application
         }
     }
 
+    fun deleteBookmark(bookmark: Bookmark) {
+        execute {
+            appDb.bookmarkDao.delete(bookmark)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkAdapter.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkAdapter.kt
index de01263ac..7db9ea6ed 100644
--- a/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkAdapter.kt
@@ -7,8 +7,10 @@ import io.legado.app.base.adapter.RecyclerAdapter
 import io.legado.app.data.entities.Bookmark
 import io.legado.app.databinding.ItemBookmarkBinding
 import io.legado.app.utils.gone
+import splitties.views.onClick
 
-class BookmarkAdapter(context: Context) : RecyclerAdapter<Bookmark, ItemBookmarkBinding>(context) {
+class BookmarkAdapter(context: Context, val callback: Callback) :
+    RecyclerAdapter<Bookmark, ItemBookmarkBinding>(context) {
 
     override fun getViewBinding(parent: ViewGroup): ItemBookmarkBinding {
         return ItemBookmarkBinding.inflate(inflater, parent, false)
@@ -28,7 +30,11 @@ class BookmarkAdapter(context: Context) : RecyclerAdapter<Bookmark, ItemBookmark
     }
 
     override fun registerListener(holder: ItemViewHolder, binding: ItemBookmarkBinding) {
-
+        binding.root.onClick {
+            getItemByLayoutPosition(holder.layoutPosition)?.let {
+                callback.onItemClick(it, holder.layoutPosition)
+            }
+        }
     }
 
     fun getHeaderText(position: Int): String {
@@ -45,4 +51,10 @@ class BookmarkAdapter(context: Context) : RecyclerAdapter<Bookmark, ItemBookmark
             && lastItem?.bookAuthor == curItem?.bookAuthor)
     }
 
+    interface Callback {
+
+        fun onItemClick(bookmark: Bookmark, position: Int)
+
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/toc/BookmarkDialog.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkDialog.kt
similarity index 95%
rename from app/src/main/java/io/legado/app/ui/book/toc/BookmarkDialog.kt
rename to app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkDialog.kt
index 47504ce65..f31fb9f8b 100644
--- a/app/src/main/java/io/legado/app/ui/book/toc/BookmarkDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/bookmark/BookmarkDialog.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.book.toc
+package io.legado.app.ui.book.bookmark
 
 import android.os.Bundle
 import android.view.View
@@ -76,7 +76,8 @@ class BookmarkDialog() : BaseDialogFragment(R.layout.dialog_bookmark) {
     }
 
     private fun getCallback(): Callback? {
-        return parentFragment as? Callback
+        return (parentFragment as? Callback)
+            ?: activity as? Callback
     }
 
     interface Callback {
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index 206ed2163..2c1c9f94b 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -38,6 +38,7 @@ import io.legado.app.model.ReadBook
 import io.legado.app.receiver.TimeBatteryReceiver
 import io.legado.app.service.BaseReadAloudService
 import io.legado.app.ui.about.AppLogDialog
+import io.legado.app.ui.book.bookmark.BookmarkDialog
 import io.legado.app.ui.book.changesource.ChangeBookSourceDialog
 import io.legado.app.ui.book.changesource.ChangeChapterSourceDialog
 import io.legado.app.ui.book.read.config.*
@@ -51,7 +52,6 @@ import io.legado.app.ui.book.read.page.provider.TextPageFactory
 import io.legado.app.ui.book.searchContent.SearchContentActivity
 import io.legado.app.ui.book.searchContent.SearchResult
 import io.legado.app.ui.book.source.edit.BookSourceEditActivity
-import io.legado.app.ui.book.toc.BookmarkDialog
 import io.legado.app.ui.book.toc.TocActivityResult
 import io.legado.app.ui.browser.WebViewActivity
 import io.legado.app.ui.dict.DictDialog
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 b0ec07f3b..8bcf03930 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
@@ -11,6 +11,7 @@ import io.legado.app.data.appDb
 import io.legado.app.data.entities.Bookmark
 import io.legado.app.databinding.FragmentBookmarkBinding
 import io.legado.app.lib.theme.primaryColor
+import io.legado.app.ui.book.bookmark.BookmarkDialog
 import io.legado.app.ui.widget.recycler.UpLinearLayoutManager
 import io.legado.app.ui.widget.recycler.VerticalDivider
 import io.legado.app.utils.setEdgeEffectColor