Update bookmarks list screen
parent
97de27dfb3
commit
b107801188
GPG Key ID:
676DEE768C17A9D7
@ -1,69 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.bookmarks.ui.adapter
|
|
||||||
|
|
||||||
import android.view.View
|
|
||||||
import androidx.lifecycle.LifecycleOwner
|
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
|
||||||
import coil.ImageLoader
|
|
||||||
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
|
|
||||||
import org.koitharu.kotatsu.R
|
|
||||||
import org.koitharu.kotatsu.bookmarks.domain.Bookmark
|
|
||||||
import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
|
|
||||||
import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
|
|
||||||
import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
|
|
||||||
import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
|
|
||||||
import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.clearItemDecorations
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.enqueueWith
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.newImageRequest
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.source
|
|
||||||
import org.koitharu.kotatsu.databinding.ItemBookmarksGroupBinding
|
|
||||||
import org.koitharu.kotatsu.list.ui.model.ListModel
|
|
||||||
import org.koitharu.kotatsu.parsers.model.Manga
|
|
||||||
|
|
||||||
fun bookmarksGroupAD(
|
|
||||||
coil: ImageLoader,
|
|
||||||
lifecycleOwner: LifecycleOwner,
|
|
||||||
sharedPool: RecyclerView.RecycledViewPool,
|
|
||||||
selectionController: SectionedSelectionController<Manga>,
|
|
||||||
bookmarkClickListener: OnListItemClickListener<Bookmark>,
|
|
||||||
groupClickListener: OnListItemClickListener<BookmarksGroup>,
|
|
||||||
) = adapterDelegateViewBinding<BookmarksGroup, ListModel, ItemBookmarksGroupBinding>(
|
|
||||||
{ layoutInflater, parent -> ItemBookmarksGroupBinding.inflate(layoutInflater, parent, false) },
|
|
||||||
) {
|
|
||||||
val viewListenerAdapter = object : View.OnClickListener, View.OnLongClickListener {
|
|
||||||
override fun onClick(v: View) = groupClickListener.onItemClick(item, v)
|
|
||||||
override fun onLongClick(v: View) = groupClickListener.onItemLongClick(item, v)
|
|
||||||
}
|
|
||||||
|
|
||||||
val adapter = BookmarksAdapter(coil, lifecycleOwner, bookmarkClickListener)
|
|
||||||
binding.recyclerView.setRecycledViewPool(sharedPool)
|
|
||||||
binding.recyclerView.adapter = adapter
|
|
||||||
val spacingDecoration = SpacingItemDecoration(context.resources.getDimensionPixelOffset(R.dimen.grid_spacing))
|
|
||||||
binding.recyclerView.addItemDecoration(spacingDecoration)
|
|
||||||
binding.root.setOnClickListener(viewListenerAdapter)
|
|
||||||
binding.root.setOnLongClickListener(viewListenerAdapter)
|
|
||||||
|
|
||||||
bind { payloads ->
|
|
||||||
if (payloads.isEmpty()) {
|
|
||||||
binding.recyclerView.clearItemDecorations()
|
|
||||||
binding.recyclerView.addItemDecoration(spacingDecoration)
|
|
||||||
selectionController.attachToRecyclerView(item.manga, binding.recyclerView)
|
|
||||||
}
|
|
||||||
binding.imageViewCover.newImageRequest(lifecycleOwner, item.manga.coverUrl)?.run {
|
|
||||||
placeholder(R.drawable.ic_placeholder)
|
|
||||||
fallback(R.drawable.ic_placeholder)
|
|
||||||
error(R.drawable.ic_error_placeholder)
|
|
||||||
allowRgb565(true)
|
|
||||||
size(CoverSizeResolver(binding.imageViewCover))
|
|
||||||
source(item.manga.source)
|
|
||||||
enqueueWith(coil)
|
|
||||||
}
|
|
||||||
binding.textViewTitle.text = item.manga.title
|
|
||||||
adapter.items = item.bookmarks
|
|
||||||
}
|
|
||||||
|
|
||||||
onViewRecycled {
|
|
||||||
binding.imageViewCover.disposeImageRequest()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.bookmarks.ui.adapter
|
|
||||||
|
|
||||||
import androidx.lifecycle.LifecycleOwner
|
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
|
||||||
import coil.ImageLoader
|
|
||||||
import org.koitharu.kotatsu.bookmarks.domain.Bookmark
|
|
||||||
import org.koitharu.kotatsu.bookmarks.ui.model.BookmarksGroup
|
|
||||||
import org.koitharu.kotatsu.core.ui.BaseListAdapter
|
|
||||||
import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
|
|
||||||
import org.koitharu.kotatsu.core.ui.list.SectionedSelectionController
|
|
||||||
import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
|
|
||||||
import org.koitharu.kotatsu.list.ui.adapter.emptyStateListAD
|
|
||||||
import org.koitharu.kotatsu.list.ui.adapter.errorStateListAD
|
|
||||||
import org.koitharu.kotatsu.list.ui.adapter.loadingFooterAD
|
|
||||||
import org.koitharu.kotatsu.list.ui.adapter.loadingStateAD
|
|
||||||
import org.koitharu.kotatsu.list.ui.model.ListModel
|
|
||||||
import org.koitharu.kotatsu.parsers.model.Manga
|
|
||||||
|
|
||||||
class BookmarksGroupAdapter(
|
|
||||||
coil: ImageLoader,
|
|
||||||
lifecycleOwner: LifecycleOwner,
|
|
||||||
selectionController: SectionedSelectionController<Manga>,
|
|
||||||
listener: ListStateHolderListener,
|
|
||||||
bookmarkClickListener: OnListItemClickListener<Bookmark>,
|
|
||||||
groupClickListener: OnListItemClickListener<BookmarksGroup>,
|
|
||||||
) : BaseListAdapter<ListModel>() {
|
|
||||||
|
|
||||||
init {
|
|
||||||
val pool = RecyclerView.RecycledViewPool()
|
|
||||||
delegatesManager
|
|
||||||
.addDelegate(
|
|
||||||
bookmarksGroupAD(
|
|
||||||
coil = coil,
|
|
||||||
lifecycleOwner = lifecycleOwner,
|
|
||||||
sharedPool = pool,
|
|
||||||
selectionController = selectionController,
|
|
||||||
bookmarkClickListener = bookmarkClickListener,
|
|
||||||
groupClickListener = groupClickListener,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.addDelegate(loadingStateAD())
|
|
||||||
.addDelegate(loadingFooterAD())
|
|
||||||
.addDelegate(emptyStateListAD(coil, lifecycleOwner, listener))
|
|
||||||
.addDelegate(errorStateListAD(listener))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.bookmarks.ui.model
|
|
||||||
|
|
||||||
import org.koitharu.kotatsu.bookmarks.domain.Bookmark
|
|
||||||
import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
|
|
||||||
import org.koitharu.kotatsu.list.ui.model.ListModel
|
|
||||||
import org.koitharu.kotatsu.parsers.model.Manga
|
|
||||||
|
|
||||||
class BookmarksGroup(
|
|
||||||
val manga: Manga,
|
|
||||||
val bookmarks: List<Bookmark>,
|
|
||||||
) : ListModel {
|
|
||||||
|
|
||||||
override fun areItemsTheSame(other: ListModel): Boolean {
|
|
||||||
return other is BookmarksGroup && other.manga.id == manga.id
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getChangePayload(previousState: ListModel): Any? {
|
|
||||||
return if (previousState is BookmarksGroup && previousState.bookmarks != bookmarks) {
|
|
||||||
ListModelDiffCallback.PAYLOAD_NESTED_LIST_CHANGED
|
|
||||||
} else {
|
|
||||||
super.getChangePayload(previousState)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun equals(other: Any?): Boolean {
|
|
||||||
if (this === other) return true
|
|
||||||
if (javaClass != other?.javaClass) return false
|
|
||||||
|
|
||||||
other as BookmarksGroup
|
|
||||||
|
|
||||||
if (manga != other.manga) return false
|
|
||||||
|
|
||||||
return bookmarks == other.bookmarks
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun hashCode(): Int {
|
|
||||||
var result = manga.hashCode()
|
|
||||||
result = 31 * result + bookmarks.hashCode()
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue