From b9f37c2601e13d4136ca5e8fe5a97dc43cfbd231 Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 4 Feb 2020 14:11:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bookshelf/books/{BooksAdapter.kt => BaseBooksAdapter.kt} | 2 +- .../io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt | 2 +- .../io/legado/app/ui/main/bookshelf/books/BooksAdapterList.kt | 2 +- .../legado/app/ui/main/bookshelf/books/BooksDiffCallBack.kt | 1 + .../io/legado/app/ui/main/bookshelf/books/BooksFragment.kt | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) rename app/src/main/java/io/legado/app/ui/main/bookshelf/books/{BooksAdapter.kt => BaseBooksAdapter.kt} (90%) diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapter.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BaseBooksAdapter.kt similarity index 90% rename from app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapter.kt rename to app/src/main/java/io/legado/app/ui/main/bookshelf/books/BaseBooksAdapter.kt index c8f085b74..9103d3c3c 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BaseBooksAdapter.kt @@ -4,7 +4,7 @@ import android.content.Context import io.legado.app.base.adapter.SimpleRecyclerAdapter import io.legado.app.data.entities.Book -abstract class BooksAdapter(context: Context, layoutId: Int) : +abstract class BaseBooksAdapter(context: Context, layoutId: Int) : SimpleRecyclerAdapter(context, layoutId) { fun notification(bookUrl: String) { diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt index ffb608f4f..92a47d790 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt @@ -12,7 +12,7 @@ import org.jetbrains.anko.sdk27.listeners.onClick import org.jetbrains.anko.sdk27.listeners.onLongClick class BooksAdapterGrid(context: Context, private val callBack: CallBack) : - BooksAdapter(context, R.layout.item_bookshelf_grid) { + BaseBooksAdapter(context, R.layout.item_bookshelf_grid) { override fun convert(holder: ItemViewHolder, item: Book, payloads: MutableList) { with(holder.itemView) { diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterList.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterList.kt index 71b70f0c2..b35d6fd21 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterList.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterList.kt @@ -12,7 +12,7 @@ import org.jetbrains.anko.sdk27.listeners.onClick import org.jetbrains.anko.sdk27.listeners.onLongClick class BooksAdapterList(context: Context, private val callBack: CallBack) : - BooksAdapter(context, R.layout.item_bookshelf_list) { + BaseBooksAdapter(context, R.layout.item_bookshelf_list) { override fun convert(holder: ItemViewHolder, item: Book, payloads: MutableList) { with(holder.itemView) { diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksDiffCallBack.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksDiffCallBack.kt index 45ad277f2..fc4358f5e 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksDiffCallBack.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksDiffCallBack.kt @@ -23,6 +23,7 @@ class BooksDiffCallBack(private val oldItems: List, private val newItems: val oldItem = oldItems[oldItemPosition] val newItem = newItems[newItemPosition] return oldItem.name == newItem.name + && oldItem.author == newItem.author && oldItem.durChapterTitle == newItem.durChapterTitle && oldItem.latestChapterTitle == newItem.latestChapterTitle && oldItem.getDisplayCover() == newItem.getDisplayCover() diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt index 0ee866fde..2b92d361b 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt @@ -29,7 +29,7 @@ import org.jetbrains.anko.startActivity class BooksFragment : BaseFragment(R.layout.fragment_books), - BooksAdapter.CallBack { + BaseBooksAdapter.CallBack { companion object { fun newInstance(position: Int, groupId: Int): BooksFragment { @@ -43,7 +43,7 @@ class BooksFragment : BaseFragment(R.layout.fragment_books), } private lateinit var activityViewModel: MainViewModel - private lateinit var booksAdapter: BooksAdapter + private lateinit var booksAdapter: BaseBooksAdapter private var bookshelfLiveData: LiveData>? = null private var position = 0 private var groupId = -1