Shikimori manga tracking selection list
parent
7f3c46942d
commit
f61497ffd9
@ -0,0 +1,97 @@
|
|||||||
|
package org.koitharu.kotatsu.shikimori.ui.selector
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import android.widget.Toast
|
||||||
|
import androidx.fragment.app.FragmentManager
|
||||||
|
import coil.transform.CircleCropTransformation
|
||||||
|
import org.koin.android.ext.android.get
|
||||||
|
import org.koin.androidx.viewmodel.ext.android.viewModel
|
||||||
|
import org.koin.core.parameter.parametersOf
|
||||||
|
import org.koitharu.kotatsu.R
|
||||||
|
import org.koitharu.kotatsu.base.domain.MangaIntent
|
||||||
|
import org.koitharu.kotatsu.base.ui.BaseBottomSheet
|
||||||
|
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
|
||||||
|
import org.koitharu.kotatsu.base.ui.list.PaginationScrollListener
|
||||||
|
import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
|
||||||
|
import org.koitharu.kotatsu.databinding.SheetShikiSelectorBinding
|
||||||
|
import org.koitharu.kotatsu.parsers.model.Manga
|
||||||
|
import org.koitharu.kotatsu.settings.SettingsActivity
|
||||||
|
import org.koitharu.kotatsu.shikimori.data.model.ShikimoriManga
|
||||||
|
import org.koitharu.kotatsu.shikimori.ui.selector.adapter.ShikimoriSelectorAdapter
|
||||||
|
import org.koitharu.kotatsu.utils.BottomSheetToolbarController
|
||||||
|
import org.koitharu.kotatsu.utils.ext.enqueueWith
|
||||||
|
import org.koitharu.kotatsu.utils.ext.getDisplayMessage
|
||||||
|
import org.koitharu.kotatsu.utils.ext.newImageRequest
|
||||||
|
import org.koitharu.kotatsu.utils.ext.withArgs
|
||||||
|
|
||||||
|
class ShikimoriSelectorBottomSheet :
|
||||||
|
BaseBottomSheet<SheetShikiSelectorBinding>(),
|
||||||
|
OnListItemClickListener<ShikimoriManga>,
|
||||||
|
PaginationScrollListener.Callback, View.OnClickListener {
|
||||||
|
|
||||||
|
private val viewModel by viewModel<ShikimoriSelectorViewModel> {
|
||||||
|
parametersOf(requireNotNull(requireArguments().getParcelable<ParcelableManga>(MangaIntent.KEY_MANGA)).manga)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): SheetShikiSelectorBinding {
|
||||||
|
return SheetShikiSelectorBinding.inflate(inflater, container, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
|
super.onViewCreated(view, savedInstanceState)
|
||||||
|
binding.toolbar.subtitle = viewModel.manga.title
|
||||||
|
binding.toolbar.setNavigationOnClickListener { dismiss() }
|
||||||
|
addBottomSheetCallback(BottomSheetToolbarController(binding.toolbar))
|
||||||
|
val listAdapter = ShikimoriSelectorAdapter(viewLifecycleOwner, get(), this)
|
||||||
|
with(binding.recyclerView) {
|
||||||
|
adapter = listAdapter
|
||||||
|
addOnScrollListener(PaginationScrollListener(4, this@ShikimoriSelectorBottomSheet))
|
||||||
|
}
|
||||||
|
binding.imageViewUser.setOnClickListener(this)
|
||||||
|
|
||||||
|
viewModel.content.observe(viewLifecycleOwner) { listAdapter.items = it }
|
||||||
|
viewModel.onError.observe(viewLifecycleOwner, ::onError)
|
||||||
|
viewModel.avatar.observe(viewLifecycleOwner, ::setUserAvatar)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onClick(v: View) {
|
||||||
|
when (v.id) {
|
||||||
|
R.id.imageView_user -> startActivity(SettingsActivity.newShikimoriSettingsIntent(v.context))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onItemClick(item: ShikimoriManga, view: View) {
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onScrolledToEnd() {
|
||||||
|
viewModel.loadList(append = true)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onError(e: Throwable) {
|
||||||
|
Toast.makeText(requireContext(), e.getDisplayMessage(resources), Toast.LENGTH_LONG).show()
|
||||||
|
if (viewModel.isEmpty) {
|
||||||
|
dismissAllowingStateLoss()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun setUserAvatar(url: String?) {
|
||||||
|
val iconSize = resources.getDimensionPixelSize(R.dimen.action_bar_item_size)
|
||||||
|
binding.imageViewUser.newImageRequest(url)
|
||||||
|
.transformations(CircleCropTransformation())
|
||||||
|
.size(iconSize, iconSize)
|
||||||
|
.enqueueWith(get())
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
|
||||||
|
private const val TAG = "ShikimoriSelectorBottomSheet"
|
||||||
|
|
||||||
|
fun show(fm: FragmentManager, manga: Manga) =
|
||||||
|
ShikimoriSelectorBottomSheet().withArgs(1) {
|
||||||
|
putParcelable(MangaIntent.KEY_MANGA, ParcelableManga(manga, withChapters = false))
|
||||||
|
}.show(fm, TAG)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,69 @@
|
|||||||
|
package org.koitharu.kotatsu.shikimori.ui.selector
|
||||||
|
|
||||||
|
import androidx.lifecycle.LiveData
|
||||||
|
import androidx.lifecycle.liveData
|
||||||
|
import androidx.lifecycle.viewModelScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.Job
|
||||||
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
|
import kotlinx.coroutines.flow.combine
|
||||||
|
import kotlinx.coroutines.flow.filterNotNull
|
||||||
|
import org.koitharu.kotatsu.base.ui.BaseViewModel
|
||||||
|
import org.koitharu.kotatsu.list.ui.model.ListModel
|
||||||
|
import org.koitharu.kotatsu.list.ui.model.LoadingFooter
|
||||||
|
import org.koitharu.kotatsu.list.ui.model.LoadingState
|
||||||
|
import org.koitharu.kotatsu.parsers.model.Manga
|
||||||
|
import org.koitharu.kotatsu.shikimori.data.ShikimoriRepository
|
||||||
|
import org.koitharu.kotatsu.shikimori.data.model.ShikimoriManga
|
||||||
|
import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
|
||||||
|
|
||||||
|
class ShikimoriSelectorViewModel(
|
||||||
|
val manga: Manga,
|
||||||
|
private val repository: ShikimoriRepository,
|
||||||
|
) : BaseViewModel() {
|
||||||
|
|
||||||
|
private val shikiMangaList = MutableStateFlow<List<ShikimoriManga>?>(null)
|
||||||
|
private val hasNextPage = MutableStateFlow(false)
|
||||||
|
private var loadingJob: Job? = null
|
||||||
|
|
||||||
|
val content: LiveData<List<ListModel>> = combine(
|
||||||
|
shikiMangaList.filterNotNull(),
|
||||||
|
hasNextPage
|
||||||
|
) { list, isHasNextPage ->
|
||||||
|
when {
|
||||||
|
list.isEmpty() -> listOf()
|
||||||
|
isHasNextPage -> list + LoadingFooter
|
||||||
|
else -> list
|
||||||
|
}
|
||||||
|
}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, listOf(LoadingState))
|
||||||
|
|
||||||
|
val avatar = liveData {
|
||||||
|
emit(runCatching { repository.getUser().avatar }.getOrNull())
|
||||||
|
}
|
||||||
|
|
||||||
|
val isEmpty: Boolean
|
||||||
|
get() = shikiMangaList.value.isNullOrEmpty()
|
||||||
|
|
||||||
|
init {
|
||||||
|
loadList(append = false)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun loadList(append: Boolean) {
|
||||||
|
if (loadingJob?.isActive == true) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (append && !hasNextPage.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
loadingJob = launchLoadingJob(Dispatchers.Default) {
|
||||||
|
val offset = if (append) shikiMangaList.value?.size ?: 0 else 0
|
||||||
|
val list = repository.findManga(manga.title, offset)
|
||||||
|
if (!append) {
|
||||||
|
shikiMangaList.value = list
|
||||||
|
} else if (list.isNotEmpty()) {
|
||||||
|
shikiMangaList.value = shikiMangaList.value?.plus(list) ?: list
|
||||||
|
}
|
||||||
|
hasNextPage.value = list.isNotEmpty()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
package org.koitharu.kotatsu.shikimori.ui.selector.adapter
|
||||||
|
|
||||||
|
import androidx.lifecycle.LifecycleOwner
|
||||||
|
import coil.ImageLoader
|
||||||
|
import coil.request.Disposable
|
||||||
|
import coil.size.Scale
|
||||||
|
import coil.util.CoilUtils
|
||||||
|
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
|
||||||
|
import org.koitharu.kotatsu.R
|
||||||
|
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
|
||||||
|
import org.koitharu.kotatsu.databinding.ItemMangaListBinding
|
||||||
|
import org.koitharu.kotatsu.list.ui.model.ListModel
|
||||||
|
import org.koitharu.kotatsu.shikimori.data.model.ShikimoriManga
|
||||||
|
import org.koitharu.kotatsu.utils.ext.enqueueWith
|
||||||
|
import org.koitharu.kotatsu.utils.ext.newImageRequest
|
||||||
|
import org.koitharu.kotatsu.utils.ext.textAndVisible
|
||||||
|
|
||||||
|
fun shikimoriMangaAD(
|
||||||
|
lifecycleOwner: LifecycleOwner,
|
||||||
|
coil: ImageLoader,
|
||||||
|
clickListener: OnListItemClickListener<ShikimoriManga>,
|
||||||
|
) = adapterDelegateViewBinding<ShikimoriManga, ListModel, ItemMangaListBinding>(
|
||||||
|
{ inflater, parent -> ItemMangaListBinding.inflate(inflater, parent, false) }
|
||||||
|
) {
|
||||||
|
|
||||||
|
var imageRequest: Disposable? = null
|
||||||
|
|
||||||
|
itemView.setOnClickListener {
|
||||||
|
clickListener.onItemClick(item, it)
|
||||||
|
}
|
||||||
|
|
||||||
|
bind {
|
||||||
|
imageRequest?.dispose()
|
||||||
|
binding.textViewTitle.text = item.name
|
||||||
|
binding.textViewSubtitle.textAndVisible = item.altName
|
||||||
|
imageRequest = binding.imageViewCover.newImageRequest(item.cover)
|
||||||
|
.placeholder(R.drawable.ic_placeholder)
|
||||||
|
.fallback(R.drawable.ic_placeholder)
|
||||||
|
.error(R.drawable.ic_placeholder)
|
||||||
|
.scale(Scale.FILL)
|
||||||
|
.allowRgb565(true)
|
||||||
|
.lifecycle(lifecycleOwner)
|
||||||
|
.enqueueWith(coil)
|
||||||
|
}
|
||||||
|
|
||||||
|
onViewRecycled {
|
||||||
|
imageRequest?.dispose()
|
||||||
|
imageRequest = null
|
||||||
|
CoilUtils.dispose(binding.imageViewCover)
|
||||||
|
binding.imageViewCover.setImageDrawable(null)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
package org.koitharu.kotatsu.shikimori.ui.selector.adapter
|
||||||
|
|
||||||
|
import androidx.lifecycle.LifecycleOwner
|
||||||
|
import androidx.recyclerview.widget.DiffUtil
|
||||||
|
import coil.ImageLoader
|
||||||
|
import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
|
||||||
|
import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
|
||||||
|
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.shikimori.data.model.ShikimoriManga
|
||||||
|
import kotlin.jvm.internal.Intrinsics
|
||||||
|
|
||||||
|
class ShikimoriSelectorAdapter(
|
||||||
|
lifecycleOwner: LifecycleOwner,
|
||||||
|
coil: ImageLoader,
|
||||||
|
clickListener: OnListItemClickListener<ShikimoriManga>,
|
||||||
|
) : AsyncListDifferDelegationAdapter<ListModel>(DiffCallback()) {
|
||||||
|
|
||||||
|
init {
|
||||||
|
delegatesManager.addDelegate(loadingStateAD())
|
||||||
|
.addDelegate(shikimoriMangaAD(lifecycleOwner, coil, clickListener))
|
||||||
|
.addDelegate(loadingFooterAD())
|
||||||
|
}
|
||||||
|
|
||||||
|
private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
|
||||||
|
|
||||||
|
override fun areItemsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
|
||||||
|
return when {
|
||||||
|
oldItem === newItem -> true
|
||||||
|
oldItem is ShikimoriManga && newItem is ShikimoriManga -> oldItem.id == newItem.id
|
||||||
|
else -> false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun areContentsTheSame(oldItem: ListModel, newItem: ListModel): Boolean {
|
||||||
|
return Intrinsics.areEqual(oldItem, newItem)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/appbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.MaterialToolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:navigationIcon="?actionModeCloseDrawable"
|
||||||
|
app:title="@string/tracking">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imageView_user"
|
||||||
|
android:layout_width="?attr/actionBarSize"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
android:layout_gravity="end"
|
||||||
|
android:scaleType="centerInside"
|
||||||
|
android:background="?actionBarItemBackground"
|
||||||
|
tools:src="@tools:sample/avatars" />
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.MaterialToolbar>
|
||||||
|
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/recyclerView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:clipToPadding="false"
|
||||||
|
android:padding="@dimen/grid_spacing"
|
||||||
|
android:scrollbarStyle="outsideOverlay"
|
||||||
|
android:scrollbars="vertical"
|
||||||
|
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||||
|
tools:listitem="@layout/item_manga_list" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
Loading…
Reference in New Issue