Merge branch 'master' of https://github.com/gedoor/legado

app/src/main/java/io/legado/app/ui/book/search/DiffCallBack.kt

@@ -1,42 +0,0 @@
-package io.legado.app.ui.book.search
-
-import android.os.Bundle
-import androidx.recyclerview.widget.DiffUtil
-import io.legado.app.data.entities.SearchBook
-
-class DiffCallBack : DiffUtil.ItemCallback<SearchBook>() {
-
-    override fun areItemsTheSame(oldItem: SearchBook, newItem: SearchBook): Boolean {
-        return when {
-            oldItem.name != newItem.name -> false
-            oldItem.author != newItem.author -> false
-            else -> true
-        }
-    }
-
-    override fun areContentsTheSame(oldItem: SearchBook, newItem: SearchBook): Boolean {
-        return when {
-            oldItem.origins.size != newItem.origins.size -> false
-            oldItem.coverUrl != newItem.coverUrl -> false
-            oldItem.kind != newItem.kind -> false
-            oldItem.latestChapterTitle != newItem.latestChapterTitle -> false
-            oldItem.intro != newItem.intro -> false
-            else -> true
-        }
-    }
-
-    override fun getChangePayload(oldItem: SearchBook, newItem: SearchBook): Any? {
-        val payload = Bundle()
-        if (oldItem.name != newItem.name) payload.putString("name", newItem.name)
-        if (oldItem.author != newItem.author) payload.putString("author", newItem.author)
-        if (oldItem.origins.size != newItem.origins.size)
-            payload.putInt("origins", newItem.origins.size)
-        if (oldItem.coverUrl != newItem.coverUrl) payload.putString("cover", newItem.coverUrl)
-        if (oldItem.kind != newItem.kind) payload.putString("kind", newItem.kind)
-        if (oldItem.latestChapterTitle != newItem.latestChapterTitle)
-            payload.putString("last", newItem.latestChapterTitle)
-        if (oldItem.intro != newItem.intro) payload.putString("intro", newItem.intro)
-        if (payload.isEmpty) return null
-        return payload
-    }
-}

app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt

@@ -44,7 +44,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
     private lateinit var bookAdapter: BookAdapter
     private lateinit var historyKeyAdapter: HistoryKeyAdapter
     private lateinit var loadMoreView: LoadMoreView
-    private lateinit var serchView: SearchView
+    private lateinit var searchView: SearchView
     private var historyData: LiveData<List<SearchKeyword>>? = null
     private var bookData: LiveData<List<Book>>? = null
     private var menu: Menu? = null
@@ -57,7 +57,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         binding.llHistory.setBackgroundColor(backgroundColor)
-        serchView = binding.titleBar.findViewById(R.id.search_view)
+        searchView = binding.titleBar.findViewById(R.id.search_view)
         initRecyclerView()
         initSearchView()
         initOtherView()
@@ -87,8 +87,8 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
                     !getPrefBoolean(PreferKey.precisionSearch)
                 )
                 precisionSearchMenuItem?.isChecked = getPrefBoolean(PreferKey.precisionSearch)
-                serchView.query?.toString()?.trim()?.let {
+                searchView.query?.toString()?.trim()?.let {
-                    serchView.setQuery(it, true)
+                    searchView.setQuery(it, true)
                 }
             }
             R.id.menu_source_manage -> startActivity<BookSourceActivity>()
@@ -99,8 +99,8 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
                 } else {
                     putPrefString("searchGroup", item.title.toString())
                 }
-                serchView.query?.toString()?.trim()?.let {
+                searchView.query?.toString()?.trim()?.let {
-                    serchView.setQuery(it, true)
+                    searchView.setQuery(it, true)
                 }
             }
         }
@@ -108,14 +108,14 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
     }
 
     private fun initSearchView() {
-        ATH.setTint(serchView, primaryTextColor)
+        ATH.setTint(searchView, primaryTextColor)
-        serchView.onActionViewExpanded()
+        searchView.onActionViewExpanded()
-        serchView.isSubmitButtonEnabled = true
+        searchView.isSubmitButtonEnabled = true
-        serchView.queryHint = getString(R.string.search_book_key)
+        searchView.queryHint = getString(R.string.search_book_key)
-        serchView.clearFocus()
+        searchView.clearFocus()
-        serchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String?): Boolean {
-                serchView.clearFocus()
+                searchView.clearFocus()
                 query?.let {
                     viewModel.saveSearchKey(query)
                     viewModel.search(it)
@@ -130,8 +130,8 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
                 return false
             }
         })
-        serchView.setOnQueryTextFocusChangeListener { _, hasFocus ->
+        searchView.setOnQueryTextFocusChangeListener { _, hasFocus ->
-            if (!hasFocus && serchView.query.toString().trim().isEmpty()) {
+            if (!hasFocus && searchView.query.toString().trim().isEmpty()) {
                 finish()
             } else {
                 openOrCloseHistory(hasFocus)
@@ -207,9 +207,9 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
 
     private fun receiptIntent(intent: Intent? = null) {
         intent?.getStringExtra("key")?.let {
-            serchView.setQuery(it, true)
+            searchView.setQuery(it, true)
         } ?: let {
-            serchView.requestFocus()
+            searchView.requestFocus()
         }
     }
 
@@ -227,7 +227,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
      */
     private fun openOrCloseHistory(open: Boolean) {
         if (open) {
-            upHistory(serchView.query.toString())
+            upHistory(searchView.query.toString())
             binding.llHistory.visibility = VISIBLE
         } else {
             binding.llHistory.visibility = GONE
@@ -299,7 +299,6 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
     /**
      * 更新搜索结果
      */
-    @Synchronized
     private fun upSearchItems(items: List<SearchBook>) {
         adapter.setItems(items)
     }
@@ -351,14 +350,14 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
     override fun searchHistory(key: String) {
         launch {
             when {
-                serchView.query.toString() == key -> {
+                searchView.query.toString() == key -> {
-                    serchView.setQuery(key, true)
+                    searchView.setQuery(key, true)
                 }
                 withContext(IO) { App.db.bookDao.findByName(key).isEmpty() } -> {
-                    serchView.setQuery(key, true)
+                    searchView.setQuery(key, true)
                 }
                 else -> {
-                    serchView.setQuery(key, false)
+                    searchView.setQuery(key, false)
                 }
             }
         }

app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt

@@ -17,7 +17,16 @@ class SearchAdapter(context: Context, val callBack: CallBack) :
     SimpleRecyclerAdapter<SearchBook, ItemSearchBinding>(context) {
 
     override val diffItemCallback: DiffUtil.ItemCallback<SearchBook>
-        get() = DiffCallBack()
+        get() = object : DiffUtil.ItemCallback<SearchBook>() {
+
+            override fun areContentsTheSame(oldItem: SearchBook, newItem: SearchBook): Boolean {
+                return true
+            }
+
+            override fun areItemsTheSame(oldItem: SearchBook, newItem: SearchBook): Boolean {
+                return false
+            }
+        }
 
     override fun getViewBinding(parent: ViewGroup): ItemSearchBinding {
         return ItemSearchBinding.inflate(inflater, parent, false)