nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add item count to media items

Browse source
This commit is contained in:
Jarne Demeulemeester 2021-06-18 14:56:32 +02:00
parent 6c220619ef
commit 930cf764ca
No known key found for this signature in database
GPG key ID: B61B7B150DB6A6D2
9 changed files with 62 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
View file

@ -28,16 +28,20 @@ fun bindViews(recyclerView: RecyclerView, data: List<View>?) {
}
@BindingAdapter("items")
fun bindItems(recyclerView: RecyclerView, data: List<ViewItem>?) {
fun bindItems(recyclerView: RecyclerView, data: List<BaseItemDto>?) {
val adapter = recyclerView.adapter as ViewItemListAdapter
adapter.submitList(data)
}
@BindingAdapter("itemImage")
fun bindItemImage(imageView: ImageView, item: ViewItem) {
fun bindItemImage(imageView: ImageView, item: BaseItemDto) {
val jellyfinApi = JellyfinApi.getInstance(imageView.context.applicationContext, "")
val itemId = if (item.type == "Episode") item.seriesId else item.id
Glide
.with(imageView.context)
.load(item.primaryImageUrl)
.load(jellyfinApi.api.baseUrl.plus("/items/${itemId}/Images/Primary"))
.transition(DrawableTransitionOptions.withCrossFade())
.placeholder(R.color.neutral_800)
.into(imageView)

28
app/src/main/java/dev/jdtech/jellyfin/adapters/ViewItemListAdapter.kt
View file

@ -1,6 +1,7 @@
package dev.jdtech.jellyfin.adapters
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
@ -9,26 +10,37 @@ import dev.jdtech.jellyfin.databinding.BaseItemBinding
import dev.jdtech.jellyfin.models.ViewItem
import org.jellyfin.sdk.model.api.BaseItemDto
class ViewItemListAdapter : ListAdapter<ViewItem, ViewItemListAdapter.ItemViewHolder>(DiffCallback) {
class ItemViewHolder(private var binding: BaseItemBinding) : RecyclerView.ViewHolder(binding.root) {
fun bind(view: ViewItem) {
binding.item = view
class ViewItemListAdapter :
ListAdapter<BaseItemDto, ViewItemListAdapter.ItemViewHolder>(DiffCallback) {
class ItemViewHolder(private var binding: BaseItemBinding) :
RecyclerView.ViewHolder(binding.root) {
fun bind(item: BaseItemDto) {
binding.item = item
binding.itemName.text = if (item.type == "Episode") item.seriesName else item.name
binding.itemCount.visibility =
if (item.userData?.unplayedItemCount != null) View.VISIBLE else View.GONE
binding.executePendingBindings()
}
}
companion object DiffCallback : DiffUtil.ItemCallback<ViewItem>() {
override fun areItemsTheSame(oldItem: ViewItem, newItem: ViewItem): Boolean {
companion object DiffCallback : DiffUtil.ItemCallback<BaseItemDto>() {
override fun areItemsTheSame(oldItem: BaseItemDto, newItem: BaseItemDto): Boolean {
return oldItem.id == newItem.id
}
override fun areContentsTheSame(oldItem: ViewItem, newItem: ViewItem): Boolean {
override fun areContentsTheSame(oldItem: BaseItemDto, newItem: BaseItemDto): Boolean {
return oldItem == newItem
}
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemViewHolder {
return ItemViewHolder(BaseItemBinding.inflate(LayoutInflater.from(parent.context), parent, false))
return ItemViewHolder(
BaseItemBinding.inflate(
LayoutInflater.from(parent.context),
parent,
false
)
)
}
override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {

2
app/src/main/java/dev/jdtech/jellyfin/adapters/ViewListAdapter.kt
View file

@ -12,6 +12,8 @@ class ViewListAdapter : ListAdapter<View, ViewListAdapter.ViewViewHolder>(DiffCa
class ViewViewHolder(private var binding: ViewItemBinding) : RecyclerView.ViewHolder(binding.root) {
fun bind(view: View) {
binding.view = view
// TODO: Change to string placeholder
binding.viewName.text = "Latest ${view.name}"
binding.itemsRecyclerView.adapter = ViewItemListAdapter()
binding.executePendingBindings()
}

2
app/src/main/java/dev/jdtech/jellyfin/models/View.kt
View file

@ -6,5 +6,5 @@ import java.util.*
data class View(
val id: UUID,
val name: String?,
var items: List<ViewItem>? = null
var items: List<BaseItemDto>? = null
)

24
app/src/main/java/dev/jdtech/jellyfin/viewmodels/HomeViewModel.kt
View file

@ -31,17 +31,10 @@ class HomeViewModel(
val views: MutableList<View> = mutableListOf()
val viewsResult = getViews(jellyfinApi.userId!!)
for (view in viewsResult.items!!) {
val items: MutableList<ViewItem> = mutableListOf()
val latestItems = getLatestMedia(jellyfinApi.userId!!, view.id)
if (latestItems.isEmpty()) continue
val v = view.toView()
for (item in latestItems) {
val i = jellyfinApi.api.baseUrl?.let { item.toViewItem(it) }
if (i != null) {
items.add(i)
}
}
v.items = items
v.items = latestItems
views.add(v)
}
@ -68,21 +61,6 @@ class HomeViewModel(
}
private fun BaseItemDto.toViewItem(baseUrl: String): ViewItem {
return when (type) {
"Episode" -> ViewItem(
id = seriesId!!,
name = seriesName,
primaryImageUrl = baseUrl.plus("/items/${seriesId}/Images/Primary")
)
else -> ViewItem(
id = id,
name = name,
primaryImageUrl = baseUrl.plus("/items/${id}/Images/Primary")
)
}
}
private fun BaseItemDto.toView(): View {
return View(
id = id,

5
app/src/main/res/drawable/circle_background.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/primary" />
</shape>

29
app/src/main/res/layout/base_item.xml
View file

@ -7,10 +7,10 @@
<variable
name="item"
type="dev.jdtech.jellyfin.models.ViewItem" />
type="org.jellyfin.sdk.model.api.BaseItemDto" />
</data>
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
@ -20,19 +20,38 @@
android:id="@+id/item_image"
android:layout_width="match_parent"
android:layout_height="220dp"
android:layout_marginBottom="8dp"
android:scaleType="centerCrop"
app:itemImage="@{item}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/roundedImageView" />
<TextView
android:id="@+id/item_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:ellipsize="end"
android:maxLines="2"
android:text="@{item.name}"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/item_image"
tools:text="Movie title" />
</LinearLayout>
<TextView
android:id="@+id/item_count"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/circle_background"
android:gravity="center"
android:text="@{item.userData.unplayedItemCount.toString()}"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
android:textColor="?attr/colorOnPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="9" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

1
app/src/main/res/layout/collection_item.xml
View file

@ -30,6 +30,7 @@
android:layout_height="wrap_content"
android:text="@{collection.name}"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
android:textSize="18sp"
tools:text="Movies" />
</LinearLayout>
</layout>

2
app/src/main/res/layout/view_item.xml
View file

@ -20,8 +20,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:text="@{view.name}"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Movies" />